Updated test suite for compatibility with Travis CI