Ammended test and improved order flow test