Merge "Update test to TEST_P"