Add hyphen/underscore integration tests