Minor tweaks to remove some warnings
Initial cut of the object mother for creating test objects