More work on patching tests

:)