remove print statements
fix a few more tests