small refactor of functional tests