Code quality and test coverage improvements suggested by DevFactory

Description

George Kankava from DevFactory offered to provide fixes for the better code quality and test coverage. This ticket will be general ticket for all the pull request he provides.

Environment

None

Assignee

Unassigned

Reporter

Ivan Senic

Labels

None

Integrator

None

Components

Sprint

None

Fix versions

Priority

Medium
Configure