Add and fix up extras tests
Merge pull request #3 from mrb/master

More extras spec, a few other tweaks