Merge "Update CSTest to start thread from setup to avoid thread leak" into main