Issue #3541: some adjustments in tests for more user friendly.

Some adjustments in tests for more user friendly.