unit test failure fixes