Refactor saved state cucumber feature to be more consistent. (It was occasionally failing locally due to a timing issue.)