Fix tests by properly migrating to 4.1 config