After resolving issue #19 the test coverage went down about 8pct, mostly because the changes for #19 were not completely tested.
