chore(engine): testsuite cleanup