Replace legacy patching tests with new ones