Increase test code coverage: refs  #554