Fixed some trip tests