Adjust/Fix unit-tests and remove debugging print