Cleanup tests
Simplify flow urls