Enhance: unit test