Merge "More CTS tests for HCE." into klp-dev