Cleaned up unit tests and @should in OrderService