Adding helper class to fix test build errors