Tweaking functional tests and fixing failures