Increase test code coverage: refs  #554
Merge branch 'dev' of github.com:projestimate/projestimate into dev