[WIP] Up coverage

Just going through the coveralls report, there is some low hanging fruit.