More work on getting a more complex test case with data dependencies going