More spec_helper_acceptance fixes
Merge pull request #108 from mhaskel/spec_helper_acceptance_fix

More spec_helper_acceptance fixes