Fixed issue and added unit tests

Related Work Items: #132
Added Extension

Related Work Items: #133