Fix test migration helper for 4.1