Merge "Add Unit tests"