Covering more of the EntityProvider and actually improving it along the way