reworking tests to work on Travis-CI