Fixed error recovery when there's a version mismatch
Updated unit tests for latest changes to Core Data stack names