fix unit tests

Heimdallrequested to merge
729-issue into develop

Closes #729 (closed)

Fix a few unit tests

Merge request reports