More work on large testcase