Unit tests: Always use ResourceDefinition for updates

Change-Id: I85ab9d0a3ed824020c7a38f7a814e7755a437b1a
Merge "Unit tests: Always use ResourceDefinition for updates"