Cleaned up new test cases added in the last commit.