Updated migration and test