Created by: sidgoyal78

Fix #8198 (closed) But this PR should be merged after #8058 is merged.

TODO: - uncomment "skipping" tests code