test failure fixes