Merge "Moving NPMS related tests to cts" into main