Merge "Improves code coverage ratio"