replaced failing stubs to make all tests pass