Fixes #1630 - Thanks to projectkk2glider for his pull request #1738 - I
only added a google test