Added TOH tests.
Merge origin/master