Fixing Deconstruction & adding unit test