Minor tweaks to resource module definitions and test

Change-Id: I362bd1534cf678d7ee8fbb4d5693887d3f2c345f