Remove persistentStoreManagedObjectContext and update tests