Fixed setObject:forSetter to protect against nil values.
Updated the main app unit tests.
Fixed a bad merge.