Fix TokenValidator tests