Merge "Update test to check subnet change"