acceptance helpers rewritten to get around more strict expectations - 12 tests to go!