Organize the unit test code
Fixed a small bug