Flow support pre-requisite: more generic variable names, improved tests