Revised test stubs