Nah, I'm gonna want to rewrite those tests completely, so I'd rather just drop them from 1.6.2.