manually migrated test fixes to stage 2