Clean up tests a little, hope to fix travis-ci builds