some more small fixes to test cases