Working on the order process, fixing tests