Fixed borked functional tests