Patches for running run test natively