Renamed the mergeProperties method
Removed unnecessary check in the factory method
Renamed Container test file
Fixed a broken test
Using namespaces everywhere