Added ability to merge custom types with properties + tests.