Add tests for default values.
Minor fixes.