Refactored test from #3989 to work correctly and also apply to #4191 and fixed the bug being tested

Refactored test from #3989 to work correctly and also apply to #4191 and fixed the bug being tested #2022