S31817: updates supporting the health monitor tests