Fixing a few failing specs, mostly by creating appropriate defaults.