Create new migration for test, and other fixes