Merge "Continue to clean up test resouces related logic"