Reduce code to use repository test base class