Fixed test breakage on mono

more cleanup