Improving coverage for unit tests