* hasParameterOption has an additional default value which we must match in the return map * Fix deprecated getMock calls