added stubs and updated tests