Removed JJ and Test