Improve Unit Test