Updated to support Travis CI and integration tests