TST: cleaning up more tests