Better coverage

@peetucket @bess @lmcglohon 

100% Coverage on this branch!