Replace dingus with mock