Merge "Fix unit tests cleanup for --resource-list option"