Edits to core data tests for write cache.. all passing