manually migrated test fixes to stage5