Overall looks good. I don't like the mockEntCurator method but I don't have a better name right now. So again, don't hold up this ACK.