Some more progress thinking about appropriate default behavior, make
more tests work. More tests need to be made to work though.