Improved FLOW test