Stub returns refactor

all specs passing.