#87 More Code Coverage