removing underscore dependency, John, all faith in tests!