increase coverage (part 2 of N)

Adding more tests to increase coverage. Partially addresses #458.

Ready for review/merge if tests pass and coverage increases.