Improve test coverage, add simplecov/coveralls

Trims some fat and patches up coverage.
good catch, anyone know why we have these names up here anyway?