Moved test cases from #8195 to a better place.
Merge pull request #8197 from s0undt3ch/develop

Moved test cases from #8195 to a better place.