fixing test case failures