Updated version.
Updated tests to reflect change in defaults.