Copy the existing tests and convert to use bean like maps
Add in configurable creation policy for onDemand, and add failing
test for the implementation