Merge "Increased code coverage"