Fixing functional test cases