Moving tests to CustomDelimiterTest as requested in code review