Add db-migrate
Update tests