Adding new unit test to cover enterprise properties
Refactoring database factory
Merging master => branch