Allow mock overriding

PONY?