Fixed failing test. Accidentally added stuff I shouldnt have to develop.
Fixed routes.
Fixed final tests
Merge pull request #174 from SartoriusEarth/develop

Fixed failing test from last pull.