Functional test passing again