Make tests work with different property sets