Refactored Test Cases (Me & Saurabh M Pairing)

Refactored Test Cases (Me & Saurabh M Pairing)