More bugfixes and updates to StandardFunctionsFlowTest.java