Improving unit test