Refinements to the functional test poms.