more work getting functional tests to go green