Engine: Fixes #3632: Cleans up spec/helpers.
Merge pull request #3367 from ehelms/engine-spec-helpers

Engine: Fixes #3632: Cleans up spec/helpers.