refactor integration test to use checkers Upstream-commit: d8b4471a593f55a06ec77e6b3e8215a20b3f0f5f Component: engine