Testsuite for Issue #1010

Code coverage 71%