Tests take ages to run, increase coverage

We have to problems in the tests:

- Maybe we are running too many "repeated" tests that take a bit long... it be cool to take a look at the current tests, see if we are repeating tests, or if we can optimize them.
- We are still quite low in coverage... I also think we should add more tests to increase coverage.