Merge "Update test to TEST_P" into sc-dev