removed debug line
fixed 3 test cases
Fixed more tests