Update tests to extend test cover by coverage
Merge pull request #583 from normanjaeckel/UpdateTests

Update tests to extend test cover by coverage