Adding Roger's test cases