fixed stubs, all tests pass