Merge "Tighten CTS test, add clarifying comment" into klp-dev