More test case work: