Some of them weren't the same as the Make equivalents, which meant that the test diverged between the two build systems (sometimes causing failures due to too-large images).

(cherry picked from commit 382c807ec03d128e99403edc9626c5d641bb6d4a)