new expect and stub syntax
remove instance variables from specs
small polish