passes more of the tests, now debugging