Extended unit test for bug #1025