Changes made as per the suggestions.
TestCases Separated