Functional test changes