[TESTS, TRAVIS] Smooth the rough edges that slipped through...

Fix the problems with the build...