Moving out data migrations to correct place
Splitting out tests to convey intent clearly