Johannes Roth

@ni4 does this PR look good to you? Are there any known problems with the two failing tests or did I introduce a bug?

Thanks, the tests passed now

Thanks for the comments, hope this fixes them. I force pushed because I overlooked some comments

done :+1:

The leaks seem to be fixed now