Corrected tests after redesign.
Started on specific response factories.