Fix travis
Cleanup; Move tester interface out to file