Fix some test inconstancies.