Merge "Adding unit tests"