Clean up multiple default specs

I added them to the result dictionary so we can check the values. Doing
so implicitly checks that the outcome is valid, since the result will be
`nil` otherwise.

Also kept that line under 80 characters :)
version bump to 0.2.1
Merge branch 'master' into v0.3.0