Object wrap term rewrite done. More tests.