Updated OrderService tests

Also fixed (or broke) formatting.