Cleanup tests
Fallback to name search if id lookup fails
Cleanup json cache