Merge "Add test coverage"