Cleaned up tests
Removed redundant files