Fix up functional test