zhang250 & zhou86: iteration 4

Modified test case names into more readable ones