- Changing occurrances of drupal_strlen and drupal_substr to strlen and...

- Changing occurrances of drupal_strlen and drupal_substr to strlen and substr, respectively. Not sure what is happening, but the drupal_ wrappers appear to be dealing with encoding incorrectly.
- Finishing up tests.