small test failure fixes