Improved unit test.