Rewrite some tests to not use fixtures Upstream-commit: 7e461915a610174bbbdd20aab30f6ed30c2909b5 Component: engine