Merge of modified code

Merging unit tests and other modifications