fix between and order; add new tests