Simplified concurrent test;
cleanup travis