Removed uneeded test
Added project tests
Refactored methods for testing