Issue86: Improving test coverage