removed debug prints
fixed some tests
more test fixes