Increase test code coverage: refs  #554 #612
Increase test code coverage: refs  #554 #612, after conflicts resolution