Refactoring tests
Merge branch 'development' of github.com:yvettecook/Trackathon into development