zhang250 & zhou86: iteration 6 test

merged test cases