cleanup These
These Arbitrary
TheseTest
Merge pull request #452 from xuwei-k/these

cleanup These. add tests