Fix test-patch warnings