Improve test coverage, add simplecov/coveralls

Trims some fat and patches up coverage.
I don't think they serve a purpose.  I think I left them by mistake.