increase coverage (part 2 of 2)

Adding more tests to bring coverage to 98.21%. Fixes #458. Read for review/merge!
Thanks for catching all these...