Merge "Improve unit test coverage"