*8888* Fix existing functional tests