Code coverage fixes [Closes #105]