Fixed the test suite
cleaned up code and removed extranious file