Added Stubs.

Added stubs and modified the way mocks are created.