fixes to tests to make comparison to flow output easier