Put check_travis in the correct place so that other tests are not skipped, and changed the CCA check to be more explicit.