Begin with cleaning up old tests
Rescue from JWT decode errors