Increase test coverage, simplify DateOrder