More work on the test cases - the runner is now almost in place