*8787* Fix tests
*8787* Get travis doing integration tests ##asmecher/8787-travis-build##

*8787* Get travis doing integration tests ##asmecher/8787-travis-build##