Fix factory for reviews and tests