fix tests for re-ordering of functions in output