Test updates. Migration almost done now.