Feature/convergence test rebased

I have merged the branches, resolved the conflict and pushed it to a new branch. No idea if thats the gutgurus way to do it though.