moved test flow into the right place