Merge "Bug-fix: Cleanup Workspace after Testing"