Better asserts in tests, removed print statements