Fix integration tests
Merge pull request #8 from ironcladlou/int-test-fixes

Fix integration tests