Functional test updates