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