Cleaned up and commented out the test cases.