unit testsfor issue #7588