Tests for diporder are fixed. They where broken to to a combination of MR !157 (merged) and !154 (merged).