Merge "Add resource clean for tests"