tidy up flowspec
fix api-flow route generation test
fix function call
fix api-vpnv4 test