Add more tests

There was quite some functionality added and it would be nice to check if it would make sense to have some more tests for the newly added functionality. This ticket is to check which tests make sense (and document it here) and also to add them.

- [ ] Improve callback tests and make reliable again