refactored little bit on question & survey factories, the specs are modified to accomodate the change
removing comment lines