Merge branch 'wip/coverage_90' into 'master'

Clean tests and cover more code

Clean up tests code
Add some tests to cover more code

See merge request !4
1 job for 1-stop-hard-coding-term-of-services-url in 10 minutes and 23 seconds (queued for 2 seconds)