Fix acceptance tests
Merge pull request #1 from mhaskel/fix_acceptance_tests

Fix acceptance tests