*8067* Fixed broken functional tests