Stuff from the toy project this one is based on.
Adding/fixing the things I forgot which makes the tests work again