Updated code to allow "default" to work.  Added some tests.

I'm not 100% certain how "default" is intended to work, so this may not be done right.  One of the tests could be improved and the other may need to be moved.