Add a class to handle test entities consistently