I wrote some tests

Since I merged your fork with my master, the stuff you're missing from my master that I did separately this morning came along for the ride.