Fix generators up till callbacks spec

Refactor generators from fixed output implementation.
Stopped at generator for callbacks spec. that generator is still failing

Author: ozimos