Merge "Adjust queue for test jobs." into tm-dev