Fixing final set of functional tests