Revert "Keep tests, but revert change since 'this' will be the element."

This reverts commit e528bf4680ae58cb3537c2c8c95b8eb273165e6f.