=str #15852 Port remaining Flow tests to new DSL