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