Remove debug statements and commented out code from current tests
Adapt several tests.