Bring the tests up-to-date with the forge compat stuff