Test has been refactored to DataDrivenTest, 2 simple testcases implemented