fixed busted test.
fixed up a couple other tests and got coverage to 100%
Merge pull request #24 from dblodgett-usgs/master

Tidying up.