Updates to testing code to prevent missing getToken error