Normalized defining and creating resources.
Normalized defining and creating resources.
Updated test.