Ashish|#00|Fixing functional tests