updating stubs and tests