Merge "Fix PropertiesTest."