Merge "Fix testing slave"