Merge "Fix WMS instance leakage of WmTests"