Fix breaking specs on travis

Also refactor old file migration