Finish entities, repo and fixture changes for SF2.1