Merge pull request #336 from mhaskel/fix_acceptance_tests