fix a couple more tests