I only extended the functional tests which directly access the database themselves.  I think with the class rename coming from your last comment it should provide necessary clarity.  But feel free to push back.