Update to test cases