Fixing functional test