Various updates to get the test working.