Merge "Fix Hashtable CTS test"