Fixing functional test -- submission