Changed to use the test cases TA provided.