Updates to test cases