working towards a fix for object supplier
refactored sub module names
working on the tests