Fixes 2 panics initialising tests Upstream-commit: 6b14d9a64576197901c9a498caef3cc6f7f3bc43 Component: engine