Increase test coverage based on Scoverage report