This removes complexity of current implementation and makes the test correct and assert the right things. Signed-off-by: Michael Crosby <crosbymichael@gmail.com> Upstream-commit: 4f4209788378e580247d4baff65ae5b58afac4ba Component: engine