Remove commented-out tests.

Will probably restore them after merge, but they got out of sync during
all the changes, and they were new with this branch anyway.