Merge "Add doctor-test package"