Merged additional tests and improved code coverage

Conflicts:
	ChangeLog