Improve the unit test according to comments