ENhance unit test