Splitting migrations into two files, make tests pass.