Merge "Increase code coverage"