order and fix tests for travis-ci