All stubs fixed, all tests passed