Give up with the order, fix tests