increase coverage (part 2 of 2)

Adding more tests to bring coverage to 98.21%. Fixes #458. Read for review/merge!
on second thought,

![](http://31.media.tumblr.com/bd426ed8849ca171c70093023181f0ab/tumblr_mzesqsVlDo1t3904qo1_500.gif)