Unit tests and bug fix.

Laura A DeCicco requested to merge ldecicco-USGS:master into master Feb 06, 2015