unit test improved