Merging -tunnelIdentifier option changes, adding the -skipCheck option, adding more tests