Add override test bodies.

While adding override tests extra option mocks were created and we need
to extract the correct parameter in legacy tests.