Minor improvements in the test.