Tests

This is a PRQ for Travis CI. Hopefully it likes the changes!