fix integration tests
Merge branch 'master' of github.com:isaiah/jubilee