Combine some of the tests proposed initially to reduce the number of builds in Travis