done - merged two test cases