TST: couple small test fixes