Remove underscore testing