Improve test coverage, add simplecov/coveralls

Trims some fat and patches up coverage.