Used jest-codemods to migrate, will have to pass everything by hand before we can merge.
Merged them with their by counterparts.