comment out/skip two test cases that are being fixed separately (and were only revealed by this refactoring)
TST: Add test cases for setitem tests