Combined more features into TerryHillTest