Merge "Add unit tests to increase coverage"