Tidying up code coverage

@TODO - This is to improve test coverage; but does not reflect the
        final state. That will fall out from work on the complex
        predicate.