Refactor for travis build, reorder API tests and when test fixtures are added