manually migrated test fixes to stage3