fixed stubs and all tests passed