added more unit tests & fixed new problem with model.order()