Code cleanup on test cases.