Integration test fixes
Merge pull request #72 from ironcladlou/test-fixes

Integration test fixes