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