Updates to test stubs