Improve test handling and try to lure travis to understand the tests.