Revert "How the hell did these tests pass before? They were WRONG"

This reverts commit cd94117a0f7b087720c7b04acf3dcbec7485f71c.