Added Mark's test cases