Engine: Fixes #3642: Cleans up spec/lib tests.
Merge pull request #3374 from ehelms/engine-spec-lib

Engine: Fixes #3642: Cleans up spec/lib tests.