assorted coverage improvements
remove six from coverage testing
Merge pull request #204 from rmcgibbo/cov

assorted coverage improvements