Eliminate from the unit tests the deprecated use of a ResourceDefinition as if it were a snippet from a CloudFormation template, in preparation for this being removed in future. Change-Id: I0449d3bff19c1294a9d0a475a4a9b623c73e11db