Tests passing with core data refactor on 7/15 afternoon