Regroup tests
Enclode unsafe characters when invalidating
Pump up test version