updated tests
more tests
no whitespace
some changes
updated debug prints