DO NOT MERGE: changes for faster travis testing

Trying to not run all the tests twice.