fix up a couple more tests