Improved a test.
Merged.