Added handling for v3 advanced segment ids which aren't just ints

The old int based advanced segment ids are deprecated. The new segment
ids are alphanumeric. I know from experimentation that their form
includes alphanumeric and alphanumeric+hyphen. Updated code for both
cases.

Consolidated tests and fixed broken references

In consolidating my test file with the preexisting GA test file, I
found a broken dependency to reset_token_store. It looks like it was
renamed to reset_default_token_store so I updated this file to point to
that. Also added tests around formatting of segment ids to the GA query
to this file.

**CLN** Removed debugging code I added.