Fixes to test cases