More spec_helper_acceptance fixes