diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactoryEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactoryEspressoTest.kt
index 43dedf109d..9e48e3c71a 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactoryEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactoryEspressoTest.kt
@@ -54,7 +54,7 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryEspressoTest {
   }
 
   @Test
-  fun getValue_WithInitial_shouldReturnQuantityWithUnitAndSystem() {
+  fun getValue_WithInitial_shouldReturn_Quantity_With_UnitAndSystem() {
     val questionnaireItemViewItem =
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
@@ -88,7 +88,7 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryEspressoTest {
   }
 
   @Test
-  fun getValue_WithoutInitial_shouldReturnQuantityWithoutUnitAndSystem() {
+  fun getValue_WithoutInitial_shouldReturn_Quantity_Without_UnitAndSystem() {
     val questionnaireItemViewItem =
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { required = true },
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewHolderFactory.kt
index 6d04e041db..127e1f164b 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewHolderFactory.kt
@@ -22,7 +22,6 @@ import android.view.ViewGroup
 import androidx.annotation.LayoutRes
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.fhir.datacapture.validation.ValidationResult
-import com.google.common.annotations.VisibleForTesting
 
 /**
  * Factory for [QuestionnaireItemViewHolder].
@@ -51,7 +50,6 @@ abstract class QuestionnaireItemViewHolderFactory(@LayoutRes open val resId: Int
  */
 open class QuestionnaireItemViewHolder(
   itemView: View,
-  @org.jetbrains.annotations.VisibleForTesting
   private val delegate: QuestionnaireItemViewHolderDelegate
 ) : RecyclerView.ViewHolder(itemView) {
   init {
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponentsTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponentsTest.kt
index c84f71cda1..759d15d1d0 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponentsTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponentsTest.kt
@@ -708,7 +708,7 @@ class MoreQuestionnaireItemComponentsTest {
   }
 
   @Test
-  fun calculatedExpression_shouldReturnExpression() {
+  fun `calculatedExpression should return expression for valid extension url`() {
     val questionnaire =
       Questionnaire.QuestionnaireItemComponent().apply {
         addExtension(
@@ -724,7 +724,7 @@ class MoreQuestionnaireItemComponentsTest {
   }
 
   @Test
-  fun calculatedExpression_shouldReturnNull() {
+  fun `calculatedExpression should return null for other extension url`() {
     val questionnaire =
       Questionnaire.QuestionnaireItemComponent().apply {
         addExtension(
@@ -933,7 +933,7 @@ class MoreQuestionnaireItemComponentsTest {
   }
 
   @Test
-  fun createQuestionResponseWithQuantityType_ShouldNotSetAnswer_WithValueEmpty() {
+  fun `createQuestionResponse should not set answer for quantity type with missing value `() {
     val question =
       Questionnaire.QuestionnaireItemComponent(
           StringType("age"),
@@ -960,7 +960,7 @@ class MoreQuestionnaireItemComponentsTest {
   }
 
   @Test
-  fun createQuestionResponseWithQuantityType_ShouldSetAnswer() {
+  fun `createQuestionResponse should set answer with quantity type`() {
     val question =
       Questionnaire.QuestionnaireItemComponent(
           StringType("age"),
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireFragmentTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireFragmentTest.kt
index 5e34825194..b14ebf4d06 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireFragmentTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireFragmentTest.kt
@@ -35,7 +35,7 @@ import org.robolectric.annotation.Config
 class QuestionnaireFragmentTest {
 
   @Test
-  fun testFragment_ShouldBeAbleToBuildQuestionnaireResponse() {
+  fun `fragment should have valid questionnaire response`() {
     val questionnaire =
       Questionnaire().apply {
         id = "a-questionnaire"
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
index fcec1b3f56..e470ae7fc7 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
@@ -2713,7 +2713,8 @@ class QuestionnaireViewModelTest(
   }
 
   @Test
-  fun questionnaireItem_calculatedExpressionExtension_shouldCalculateValue_onStart() = runBlocking {
+  fun `should calculate value on start for questionnaire item with calculated expression extension`() =
+      runBlocking {
     val questionnaire =
       Questionnaire().apply {
         id = "a-questionnaire"
@@ -2771,7 +2772,7 @@ class QuestionnaireViewModelTest(
   }
 
   @Test
-  fun questionnaireItem_calculatedExpressionExtension_shouldCalculateValue_onChange() =
+  fun `should calculate value on change for questionnaire item with calculated expression extension`() =
       runBlocking {
     val questionnaire =
       Questionnaire().apply {
@@ -2833,7 +2834,7 @@ class QuestionnaireViewModelTest(
   }
 
   @Test
-  fun questionnaireItem_calculatedExpressionExtensionInFlatList_shouldDetectCyclicDependency() =
+  fun `should detect cyclic dependency for questionnaire item with calculated expression extension in flat list`() =
       runBlocking {
     val questionnaire =
       Questionnaire().apply {
@@ -2887,7 +2888,7 @@ class QuestionnaireViewModelTest(
   }
 
   @Test
-  fun questionnaireItem_calculatedExpressionExtensionInNestedItems_shouldDetectCyclicDependency() =
+  fun `should detect cyclic dependency for questionnaire item with calculated expression extension in nested list`() =
       runBlocking {
     val questionnaire =
       Questionnaire().apply {
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactoryTest.kt
index 36c87da299..e92a129105 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactoryTest.kt
@@ -72,7 +72,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
   }
 
   @Test
-  fun shouldSetEmptyDateInput_WhenDateFieldInitialized_AndDateIsNull() {
+  fun `should set text field empty when date field is initialized but answer date value is null`() {
     viewHolder.bind(
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },