more fixes to test cases