Correct commented-out tests from b0b33a97f6f6db94d9b0266f5fb663175499f275