Moved patching code into the setUp() function, cleaned up obsolete patches