More updates to test cases