Reworking the test cases.