Fix some tests that use “extend”