wip: some functest fixy bits

Change-Id: I88297b26c131f9e409a450e7f6facb1c9ac47b65