Tests

Inspired by our lack of coverage, here are a bunch more tests. They already wrangled up a couple bugs, so that was an added bonus.
small bug, str isn't really consistent between 2 and 3, so we just use six to deal with it now.