Improving test code coverage as per #2.