Merge "Change package of subtype count unit test"