Improved the unit test.