Minor changes to test cases