First stab at extending the test system
Updated to the new travis config