Improve code coverage in unit tests

Paal Kvammerequested to merge
kvamme62/code-coverage into master

Improve code coverage by amending old and writing new unit tests.

Merge request reports