Functional test improvements