Improved a unit test