Fix tests
some code cleanup that should make the tests more stable and at least fix the latest changes to make them pass, again.
Edited by julian.baeume
some code cleanup that should make the tests more stable and at least fix the latest changes to make them pass, again.