Added tests in order and client