Add tests for HOC