|#450|Fixing functional tests