Tests

Finished working on tests

requested review from @tamml

assigned to @edvargh

added 9 commits

• 02b3f765...228379ee - 8 commits from branch dev
• 368eda7e - Fixed merge conflicts

Compare with previous version

approved this merge request

mentioned in commit 054f4061

merged