Update test resources
Cleanup tests