Added test cases from Chris