Tests passing on Travis CI