Fixed issue #2343
Fix test suite names
Fixed issue #2343. Fix random test failure.