Merge pull request #472 from mhaskel/acceptance_test_fixes