Fixed test data so work with the latest token expiry stuff.
Also, added some null checking around new token expiry stuff to keep the
unit tests simple and working.
Merge pull request #618 from ORCID/fixBadScopeInUnitTestData

Fixed test data so work with the latest token expiry stuff.