Re-arranged tests to reduce travis log file size - Build attempt 1