Test engine fixes.