Cleanup, singlet engine test bugfix.