Merge "Add unit tests"