added additional coverage tests.

Removed code, that was not needed anymore