Revised test setup code.