Further test case work