[REVERT] tests added in  forward port e2e60bf4eb89d92e883e8520771523c1c0377fd3

This is related to the revert 333852e19dd3d5174e07e29f9d8f6c087b2c09f6