Create migration, refactor test and update controller