Improve test coverage, add simplecov/coveralls

Trims some fat and patches up coverage.
Name here doesn't line up with filename.