Improving unit tests