Fix test suite, remove all monkeypatches