Fix tests to take renamed DataProperierty into consideration