In any case, we shouldn't leave these tests commented out. Rewrite them as if each assert would give what it  should and `@XFAIL` them if they don't pass.