Corrected all tests, removed redundant file