[Engine-devel] clean testable code