Fix acceptance test failures
Merge pull request #26 from mhaskel/test-fixes

Fix acceptance test failures