Revert "Removed unnecessary and irrelevant test cases"

This reverts commit d18dec57640dafec2c7f5c3b9574c74be4b32316.
Refactored and removed unnecessary lines