Name changes and general tidying
More refactoring
Refining the coverage so as to work through a configuration instance
object