Increase test coverage. Remove dead code.
Clean up some .to_bool calls.
Merge pull request #1106 from NatTuck/better-coverage

Better test coverage