Further improvements to functional test coverage.