Merge "Adding to unit test coverage"