Seperated testcase & modified variable names