Initial CHO Test commit

This is very helpful, good catch