Renamed file.
Split underscore behavior into separate files; added supporting tests.