Changed RegExp check to use indexOf, updated unity test for new changes