Moving tests around, changing entry point for travis