We should go through the old tests in another PR. I just adjusted the old code to look 'almost' conform as before.