fixed up mock with new interface