Functional test fix