diff --git a/app/src/main/java/org/oppia/app/home/HomeActivity.kt b/app/src/main/java/org/oppia/app/home/HomeActivity.kt
index b5edb747943..f98387b3c48 100644
--- a/app/src/main/java/org/oppia/app/home/HomeActivity.kt
+++ b/app/src/main/java/org/oppia/app/home/HomeActivity.kt
@@ -11,8 +11,7 @@ import javax.inject.Inject
 
 /** The central activity for all users entering the app. */
 class HomeActivity : InjectableAppCompatActivity(), RouteToTopicListener {
-  @Inject
-  lateinit var homeActivityPresenter: HomeActivityPresenter
+  @Inject lateinit var homeActivityPresenter: HomeActivityPresenter
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/org/oppia/app/player/audio/AudioFragment.kt b/app/src/main/java/org/oppia/app/player/audio/AudioFragment.kt
index b1c8519ccb4..c066a8f9fbc 100755
--- a/app/src/main/java/org/oppia/app/player/audio/AudioFragment.kt
+++ b/app/src/main/java/org/oppia/app/player/audio/AudioFragment.kt
@@ -11,8 +11,7 @@ import javax.inject.Inject
 
 /** Fragment that controls audio for a content-card. */
 class AudioFragment : InjectableFragment(), LanguageInterface, AudioUiManager, CellularDataInterface {
-  @Inject
-  lateinit var audioFragmentPresenter: AudioFragmentPresenter
+  @Inject lateinit var audioFragmentPresenter: AudioFragmentPresenter
 
   override fun onAttach(context: Context) {
     super.onAttach(context)
diff --git a/app/src/main/java/org/oppia/app/player/exploration/ExplorationActivity.kt b/app/src/main/java/org/oppia/app/player/exploration/ExplorationActivity.kt
index b3a1f28ae49..e852462f9aa 100755
--- a/app/src/main/java/org/oppia/app/player/exploration/ExplorationActivity.kt
+++ b/app/src/main/java/org/oppia/app/player/exploration/ExplorationActivity.kt
@@ -18,8 +18,7 @@ private const val TAG_STOP_EXPLORATION_DIALOG = "STOP_EXPLORATION_DIALOG"
 
 /** The starting point for exploration. */
 class ExplorationActivity : InjectableAppCompatActivity(), StopExplorationInterface, StateKeyboardButtonListener, AudioButtonListener {
-  @Inject
-  lateinit var explorationActivityPresenter: ExplorationActivityPresenter
+  @Inject lateinit var explorationActivityPresenter: ExplorationActivityPresenter
   private lateinit var explorationId: String
   private var topicId: String? = null
 
diff --git a/app/src/main/java/org/oppia/app/player/state/SelectionInteractionView.kt b/app/src/main/java/org/oppia/app/player/state/SelectionInteractionView.kt
index 7935fe7a2ed..50675ed063a 100644
--- a/app/src/main/java/org/oppia/app/player/state/SelectionInteractionView.kt
+++ b/app/src/main/java/org/oppia/app/player/state/SelectionInteractionView.kt
@@ -32,8 +32,8 @@ class SelectionInteractionView @JvmOverloads constructor(
   // Default to checkboxes to ensure that something can render even if it may not be correct.
   private var selectionItemInputType: SelectionItemInputType = SelectionItemInputType.CHECKBOXES
 
-  @Inject
-  lateinit var htmlParserFactory: HtmlParser.Factory
+  @Inject lateinit var htmlParserFactory: HtmlParser.Factory
+
   @Inject
   @field:ExplorationHtmlParserEntityType
   lateinit var entityType: String
diff --git a/app/src/main/java/org/oppia/app/player/state/StateFragment.kt b/app/src/main/java/org/oppia/app/player/state/StateFragment.kt
index b2b01fa5840..210a8cd9bed 100755
--- a/app/src/main/java/org/oppia/app/player/state/StateFragment.kt
+++ b/app/src/main/java/org/oppia/app/player/state/StateFragment.kt
@@ -27,8 +27,7 @@ class StateFragment : InjectableFragment(), InteractionAnswerReceiver {
     }
   }
 
-  @Inject
-  lateinit var stateFragmentPresenter: StateFragmentPresenter
+  @Inject lateinit var stateFragmentPresenter: StateFragmentPresenter
 
   override fun onAttach(context: Context) {
     super.onAttach(context)
diff --git a/app/src/main/java/org/oppia/app/profile/AddProfileActivity.kt b/app/src/main/java/org/oppia/app/profile/AddProfileActivity.kt
index 94710ed1a3e..2b8a70f14a4 100644
--- a/app/src/main/java/org/oppia/app/profile/AddProfileActivity.kt
+++ b/app/src/main/java/org/oppia/app/profile/AddProfileActivity.kt
@@ -11,8 +11,7 @@ const val KEY_ADD_PROFILE_COLOR_RGB = "KEY_ADD_PROFILE_COLOR_RGB"
 
 /** Activity that allows users to create new profiles. */
 class AddProfileActivity : InjectableAppCompatActivity() {
-  @Inject
-  lateinit var addProfileFragmentPresenter: AddProfileActivityPresenter
+  @Inject lateinit var addProfileFragmentPresenter: AddProfileActivityPresenter
 
   companion object {
     fun createAddProfileActivityIntent(context: Context, colorRgb: Int): Intent {
diff --git a/app/src/main/java/org/oppia/app/profile/AdminAuthActivity.kt b/app/src/main/java/org/oppia/app/profile/AdminAuthActivity.kt
index ca4de66560c..454f94df4f6 100644
--- a/app/src/main/java/org/oppia/app/profile/AdminAuthActivity.kt
+++ b/app/src/main/java/org/oppia/app/profile/AdminAuthActivity.kt
@@ -11,8 +11,7 @@ const val KEY_ADMIN_AUTH_COLOR_RGB = "ADMIN_AUTH_COLOR_RGB"
 
 /** Activity that authenticates by checking for admin's PIN. */
 class AdminAuthActivity : InjectableAppCompatActivity() {
-  @Inject
-  lateinit var adminAuthFragmentPresenter: AdminAuthActivityPresenter
+  @Inject lateinit var adminAuthFragmentPresenter: AdminAuthActivityPresenter
 
   companion object {
     fun createAdminAuthActivityIntent(context: Context, adminPin: String, colorRgb: Int): Intent {
diff --git a/app/src/main/java/org/oppia/app/profile/AdminPinActivity.kt b/app/src/main/java/org/oppia/app/profile/AdminPinActivity.kt
index afd95fbf395..d5a7f9ba6d7 100644
--- a/app/src/main/java/org/oppia/app/profile/AdminPinActivity.kt
+++ b/app/src/main/java/org/oppia/app/profile/AdminPinActivity.kt
@@ -11,8 +11,7 @@ const val KEY_ADMIN_PIN_COLOR_RGB = "ADMIN_PIN_COLOR_RGB"
 
 /** Activity that sets the admin's PIN. */
 class AdminPinActivity : InjectableAppCompatActivity() {
-  @Inject
-  lateinit var adminPinActivityPresenter: AdminPinActivityPresenter
+  @Inject lateinit var adminPinActivityPresenter: AdminPinActivityPresenter
 
   companion object {
     fun createAdminPinActivityIntent(context: Context, profileId: Int, colorRgb: Int): Intent {
diff --git a/app/src/main/java/org/oppia/app/profile/ProfileActivity.kt b/app/src/main/java/org/oppia/app/profile/ProfileActivity.kt
index d9b9e71cf41..3bc6fbd0cb8 100644
--- a/app/src/main/java/org/oppia/app/profile/ProfileActivity.kt
+++ b/app/src/main/java/org/oppia/app/profile/ProfileActivity.kt
@@ -7,8 +7,7 @@ import javax.inject.Inject
 
 /** Activity that controls profile creation and selection. */
 class ProfileActivity : InjectableAppCompatActivity() {
-  @Inject
-  lateinit var profileActivityPresenter: ProfileActivityPresenter
+  @Inject lateinit var profileActivityPresenter: ProfileActivityPresenter
 
   @ExperimentalCoroutinesApi
   override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/oppia/app/profile/ProfileChooserFragment.kt b/app/src/main/java/org/oppia/app/profile/ProfileChooserFragment.kt
index 558949b6ae4..80afa29e4a2 100644
--- a/app/src/main/java/org/oppia/app/profile/ProfileChooserFragment.kt
+++ b/app/src/main/java/org/oppia/app/profile/ProfileChooserFragment.kt
@@ -11,8 +11,7 @@ import javax.inject.Inject
 
 /** Fragment that allows user to select a profile or create new ones. */
 class ProfileChooserFragment : InjectableFragment() {
-  @Inject
-  lateinit var profileChooserFragmentPresenter: ProfileChooserFragmentPresenter
+  @Inject lateinit var profileChooserFragmentPresenter: ProfileChooserFragmentPresenter
 
   override fun onAttach(context: Context) {
     super.onAttach(context)
diff --git a/app/src/main/java/org/oppia/app/story/StoryActivity.kt b/app/src/main/java/org/oppia/app/story/StoryActivity.kt
index c227a220956..e6adad703f0 100644
--- a/app/src/main/java/org/oppia/app/story/StoryActivity.kt
+++ b/app/src/main/java/org/oppia/app/story/StoryActivity.kt
@@ -10,8 +10,7 @@ import javax.inject.Inject
 
 /** Activity for stories. */
 class StoryActivity : InjectableAppCompatActivity(), RouteToExplorationListener {
-  @Inject
-  lateinit var storyActivityPresenter: StoryActivityPresenter
+  @Inject lateinit var storyActivityPresenter: StoryActivityPresenter
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/org/oppia/app/story/StoryFragment.kt b/app/src/main/java/org/oppia/app/story/StoryFragment.kt
index 34415e896e9..b488f24f31a 100644
--- a/app/src/main/java/org/oppia/app/story/StoryFragment.kt
+++ b/app/src/main/java/org/oppia/app/story/StoryFragment.kt
@@ -23,8 +23,7 @@ class StoryFragment : InjectableFragment(), ExplorationSelectionListener {
     }
   }
 
-  @Inject
-  lateinit var storyFragmentPresenter: StoryFragmentPresenter
+  @Inject lateinit var storyFragmentPresenter: StoryFragmentPresenter
 
   override fun onAttach(context: Context) {
     super.onAttach(context)
diff --git a/app/src/main/java/org/oppia/app/testing/BindableAdapterTestFragment.kt b/app/src/main/java/org/oppia/app/testing/BindableAdapterTestFragment.kt
index 0a9c477dc1a..2d2f4e21a33 100644
--- a/app/src/main/java/org/oppia/app/testing/BindableAdapterTestFragment.kt
+++ b/app/src/main/java/org/oppia/app/testing/BindableAdapterTestFragment.kt
@@ -13,8 +13,7 @@ const val BINDABLE_TEST_FRAGMENT_TAG = "bindable_adapter_test_fragment"
 // TODO(#59): Make this fragment only included in relevant tests instead of all prod builds.
 /** A test fragment for the bindable RecyclerView adapter. */
 class BindableAdapterTestFragment: InjectableFragment() {
-  @Inject
-  lateinit var bindableAdapterTestFragmentPresenter: BindableAdapterTestFragmentPresenter
+  @Inject lateinit var bindableAdapterTestFragmentPresenter: BindableAdapterTestFragmentPresenter
 
   override fun onAttach(context: Context) {
     super.onAttach(context)
diff --git a/app/src/main/java/org/oppia/app/testing/ContentCardTestActivity.kt b/app/src/main/java/org/oppia/app/testing/ContentCardTestActivity.kt
index fe9d06058a1..b609d3982d3 100644
--- a/app/src/main/java/org/oppia/app/testing/ContentCardTestActivity.kt
+++ b/app/src/main/java/org/oppia/app/testing/ContentCardTestActivity.kt
@@ -6,8 +6,7 @@ import javax.inject.Inject
 
 /** Activity to test the functionality of content-card used in [StateFragment]. */
 class ContentCardTestActivity : InjectableAppCompatActivity() {
-  @Inject
-  lateinit var contentCardTestPresenter: ContentCardTestActivityPresenter
+  @Inject lateinit var contentCardTestPresenter: ContentCardTestActivityPresenter
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/org/oppia/app/testing/ExplorationTestActivity.kt b/app/src/main/java/org/oppia/app/testing/ExplorationTestActivity.kt
index 7b2a1ca1ebf..85c5a4f8e8b 100644
--- a/app/src/main/java/org/oppia/app/testing/ExplorationTestActivity.kt
+++ b/app/src/main/java/org/oppia/app/testing/ExplorationTestActivity.kt
@@ -9,8 +9,7 @@ import javax.inject.Inject
 
 /** The activity for testing [TopicFragment]. */
 class ExplorationTestActivity : InjectableAppCompatActivity(), RouteToExplorationListener {
-  @Inject
-  lateinit var explorationTestActivityPresenter: ExplorationTestActivityPresenter
+  @Inject lateinit var explorationTestActivityPresenter: ExplorationTestActivityPresenter
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/org/oppia/app/testing/HtmlParserTestActivity.kt b/app/src/main/java/org/oppia/app/testing/HtmlParserTestActivity.kt
index 16e78e659e4..c4b80e59243 100644
--- a/app/src/main/java/org/oppia/app/testing/HtmlParserTestActivity.kt
+++ b/app/src/main/java/org/oppia/app/testing/HtmlParserTestActivity.kt
@@ -10,8 +10,7 @@ import javax.inject.Inject
 
 /** This is a dummy activity to test Html parsing. */
 class HtmlParserTestActivity : InjectableAppCompatActivity() {
-  @Inject
-  lateinit var htmlParserFactory: HtmlParser.Factory
+  @Inject lateinit var htmlParserFactory: HtmlParser.Factory
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/org/oppia/app/testing/TopicTestActivity.kt b/app/src/main/java/org/oppia/app/testing/TopicTestActivity.kt
index a505bdadd68..9d8b7dd3e5c 100644
--- a/app/src/main/java/org/oppia/app/testing/TopicTestActivity.kt
+++ b/app/src/main/java/org/oppia/app/testing/TopicTestActivity.kt
@@ -19,8 +19,7 @@ import javax.inject.Inject
 /** The activity for testing [TopicFragment]. */
 class TopicTestActivity : InjectableAppCompatActivity(), RouteToQuestionPlayerListener, RouteToConceptCardListener,
   RouteToStoryListener, RouteToExplorationListener, ConceptCardListener {
-  @Inject
-  lateinit var topicActivityPresenter: TopicActivityPresenter
+  @Inject lateinit var topicActivityPresenter: TopicActivityPresenter
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/org/oppia/app/testing/TopicTestActivityForStory.kt b/app/src/main/java/org/oppia/app/testing/TopicTestActivityForStory.kt
index 882b5b0eb83..3c4bbc2f41c 100644
--- a/app/src/main/java/org/oppia/app/testing/TopicTestActivityForStory.kt
+++ b/app/src/main/java/org/oppia/app/testing/TopicTestActivityForStory.kt
@@ -21,8 +21,7 @@ import javax.inject.Inject
 class TopicTestActivityForStory : InjectableAppCompatActivity(), RouteToQuestionPlayerListener,
   RouteToConceptCardListener, RouteToStoryListener,
   RouteToExplorationListener, ConceptCardListener {
-  @Inject
-  lateinit var topicActivityPresenter: TopicActivityPresenter
+  @Inject lateinit var topicActivityPresenter: TopicActivityPresenter
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/org/oppia/app/topic/TopicActivity.kt b/app/src/main/java/org/oppia/app/topic/TopicActivity.kt
index 89ccf33a377..bdad8918ba5 100644
--- a/app/src/main/java/org/oppia/app/topic/TopicActivity.kt
+++ b/app/src/main/java/org/oppia/app/topic/TopicActivity.kt
@@ -19,8 +19,7 @@ class TopicActivity : InjectableAppCompatActivity(), RouteToQuestionPlayerListen
   RouteToStoryListener, RouteToExplorationListener, ConceptCardListener {
   private lateinit var topicId: String
   private var storyId: String? = null
-  @Inject
-  lateinit var topicActivityPresenter: TopicActivityPresenter
+  @Inject lateinit var topicActivityPresenter: TopicActivityPresenter
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/org/oppia/app/topic/TopicFragment.kt b/app/src/main/java/org/oppia/app/topic/TopicFragment.kt
index d4a1e9e71a3..1eb29b7e323 100644
--- a/app/src/main/java/org/oppia/app/topic/TopicFragment.kt
+++ b/app/src/main/java/org/oppia/app/topic/TopicFragment.kt
@@ -11,8 +11,8 @@ import javax.inject.Inject
 
 /** Fragment that contains tabs for Topic. */
 class TopicFragment : InjectableFragment() {
-  @Inject
-  lateinit var topicFragmentPresenter: TopicFragmentPresenter
+  @Inject lateinit var topicFragmentPresenter: TopicFragmentPresenter
+
   lateinit var topicId: String
 
   override fun onAttach(context: Context) {
diff --git a/app/src/main/java/org/oppia/app/topic/overview/TopicOverviewFragment.kt b/app/src/main/java/org/oppia/app/topic/overview/TopicOverviewFragment.kt
index f98e041bba5..ebf1f7398ce 100644
--- a/app/src/main/java/org/oppia/app/topic/overview/TopicOverviewFragment.kt
+++ b/app/src/main/java/org/oppia/app/topic/overview/TopicOverviewFragment.kt
@@ -10,8 +10,7 @@ import javax.inject.Inject
 
 /** Fragment that contains overview of Topic. */
 class TopicOverviewFragment : InjectableFragment() {
-  @Inject
-  lateinit var topicOverviewFragmentPresenter: TopicOverviewFragmentPresenter
+  @Inject lateinit var topicOverviewFragmentPresenter: TopicOverviewFragmentPresenter
 
   override fun onAttach(context: Context) {
     super.onAttach(context)
diff --git a/app/src/main/java/org/oppia/app/topic/play/TopicPlayFragment.kt b/app/src/main/java/org/oppia/app/topic/play/TopicPlayFragment.kt
index e30d37af405..c69a1b6d55e 100644
--- a/app/src/main/java/org/oppia/app/topic/play/TopicPlayFragment.kt
+++ b/app/src/main/java/org/oppia/app/topic/play/TopicPlayFragment.kt
@@ -13,8 +13,7 @@ private const val KEY_CURRENT_EXPANDED_LIST_INDEX = "CURRENT_EXPANDED_LIST_INDEX
 
 /** Fragment that contains subtopic list for play mode. */
 class TopicPlayFragment : InjectableFragment(), ExpandedChapterListIndexListener, StorySummarySelector {
-  @Inject
-  lateinit var topicPlayFragmentPresenter: TopicPlayFragmentPresenter
+  @Inject lateinit var topicPlayFragmentPresenter: TopicPlayFragmentPresenter
 
   private var currentExpandedChapterListIndex: Int? = null
 
diff --git a/app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivity.kt b/app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivity.kt
index 99113fcfe80..0bcaaf38a0c 100644
--- a/app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivity.kt
+++ b/app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivity.kt
@@ -10,8 +10,7 @@ const val QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_ARGUMENT_KEY = "QuestionPlayerA
 
 /** Activity for QuestionPlayer in train mode. */
 class QuestionPlayerActivity : InjectableAppCompatActivity() {
-  @Inject
-  lateinit var questionPlayerActivityPresenter: QuestionPlayerActivityPresenter
+  @Inject lateinit var questionPlayerActivityPresenter: QuestionPlayerActivityPresenter
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerFragment.kt b/app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerFragment.kt
index fa15d4c4fd0..698e78b5f15 100644
--- a/app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerFragment.kt
+++ b/app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerFragment.kt
@@ -10,8 +10,7 @@ import javax.inject.Inject
 
 /** Fragment that contains all questions in Question Player. */
 class QuestionPlayerFragment: InjectableFragment(){
-  @Inject
-  lateinit var questionPlayerFragmentPresenter: QuestionPlayerFragmentPresenter
+  @Inject lateinit var questionPlayerFragmentPresenter: QuestionPlayerFragmentPresenter
 
   override fun onAttach(context: Context) {
     super.onAttach(context)
diff --git a/app/src/main/java/org/oppia/app/topic/review/TopicReviewFragment.kt b/app/src/main/java/org/oppia/app/topic/review/TopicReviewFragment.kt
index de34f33d933..c10f03d0860 100644
--- a/app/src/main/java/org/oppia/app/topic/review/TopicReviewFragment.kt
+++ b/app/src/main/java/org/oppia/app/topic/review/TopicReviewFragment.kt
@@ -11,8 +11,7 @@ import javax.inject.Inject
 
 /** Fragment that card for topic review. */
 class TopicReviewFragment : InjectableFragment(), ReviewSkillSelector {
-  @Inject
-  lateinit var topicReviewFragmentPresenter: TopicReviewFragmentPresenter
+  @Inject lateinit var topicReviewFragmentPresenter: TopicReviewFragmentPresenter
 
   override fun onAttach(context: Context) {
     super.onAttach(context)
diff --git a/app/src/main/java/org/oppia/app/topic/train/TopicTrainFragment.kt b/app/src/main/java/org/oppia/app/topic/train/TopicTrainFragment.kt
index c643ac74695..a3d196888c6 100644
--- a/app/src/main/java/org/oppia/app/topic/train/TopicTrainFragment.kt
+++ b/app/src/main/java/org/oppia/app/topic/train/TopicTrainFragment.kt
@@ -12,8 +12,7 @@ private const val KEY_SKILL_ID_LIST = "SKILL_ID_LIST"
 
 /** Fragment that displays skills for topic train mode. */
 class TopicTrainFragment : InjectableFragment() {
-  @Inject
-  lateinit var topicTrainFragmentPresenter: TopicTrainFragmentPresenter
+  @Inject lateinit var topicTrainFragmentPresenter: TopicTrainFragmentPresenter
 
   override fun onAttach(context: Context) {
     super.onAttach(context)
diff --git a/app/src/sharedTest/java/org/oppia/app/player/audio/AudioFragmentTest.kt b/app/src/sharedTest/java/org/oppia/app/player/audio/AudioFragmentTest.kt
index 134bb3cf251..c3fb7c3e031 100644
--- a/app/src/sharedTest/java/org/oppia/app/player/audio/AudioFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/app/player/audio/AudioFragmentTest.kt
@@ -65,8 +65,7 @@ class AudioFragmentTest {
 
   private lateinit var activityScenario: ActivityScenario<AudioFragmentTestActivity>
 
-  @Inject
-  lateinit var audioPlayerController: AudioPlayerController
+  @Inject lateinit var audioPlayerController: AudioPlayerController
   private lateinit var shadowMediaPlayer: Any
 
   private val TEST_URL = "https://storage.googleapis.com/oppiaserver-resources/exploration/2mzzFVDLuAj8/assets/audio/content-en-057j51i2es.mp3"
diff --git a/data/src/test/java/org/oppia/data/persistence/PersistentCacheStoreTest.kt b/data/src/test/java/org/oppia/data/persistence/PersistentCacheStoreTest.kt
index f2077c0aef3..d8dda022206 100644
--- a/data/src/test/java/org/oppia/data/persistence/PersistentCacheStoreTest.kt
+++ b/data/src/test/java/org/oppia/data/persistence/PersistentCacheStoreTest.kt
@@ -57,11 +57,9 @@ class PersistentCacheStoreTest {
   @JvmField
   val mockitoRule: MockitoRule = MockitoJUnit.rule()
 
-  @Inject
-  lateinit var cacheFactory: PersistentCacheStore.Factory
+  @Inject lateinit var cacheFactory: PersistentCacheStore.Factory
 
-  @Inject
-  lateinit var dataProviders: DataProviders
+  @Inject lateinit var dataProviders: DataProviders
 
   @ExperimentalCoroutinesApi
   @Inject
diff --git a/domain/src/test/java/org/oppia/domain/UserAppHistoryControllerTest.kt b/domain/src/test/java/org/oppia/domain/UserAppHistoryControllerTest.kt
index e9565628b22..f73881afbe2 100644
--- a/domain/src/test/java/org/oppia/domain/UserAppHistoryControllerTest.kt
+++ b/domain/src/test/java/org/oppia/domain/UserAppHistoryControllerTest.kt
@@ -58,8 +58,7 @@ class UserAppHistoryControllerTest {
   @JvmField
   val executorRule = InstantTaskExecutorRule()
 
-  @Inject
-  lateinit var userAppHistoryController: UserAppHistoryController
+  @Inject lateinit var userAppHistoryController: UserAppHistoryController
 
   @Inject
   @field:TestDispatcher
diff --git a/domain/src/test/java/org/oppia/domain/audio/CellularAudioDialogControllerTest.kt b/domain/src/test/java/org/oppia/domain/audio/CellularAudioDialogControllerTest.kt
index f3b5a5ff673..09299b29942 100644
--- a/domain/src/test/java/org/oppia/domain/audio/CellularAudioDialogControllerTest.kt
+++ b/domain/src/test/java/org/oppia/domain/audio/CellularAudioDialogControllerTest.kt
@@ -49,8 +49,7 @@ class CellularAudioDialogControllerTest {
   @JvmField
   val mockitoRule: MockitoRule = MockitoJUnit.rule()
 
-  @Inject
-  lateinit var cellularAudioDialogController: CellularAudioDialogController
+  @Inject lateinit var cellularAudioDialogController: CellularAudioDialogController
 
   @Inject
   @field:TestDispatcher
diff --git a/domain/src/test/java/org/oppia/domain/classify/AnswerClassificationControllerTest.kt b/domain/src/test/java/org/oppia/domain/classify/AnswerClassificationControllerTest.kt
index adef3d98873..08443b6c771 100644
--- a/domain/src/test/java/org/oppia/domain/classify/AnswerClassificationControllerTest.kt
+++ b/domain/src/test/java/org/oppia/domain/classify/AnswerClassificationControllerTest.kt
@@ -104,8 +104,7 @@ class AnswerClassificationControllerTest {
       .build()
   }
 
-  @Inject
-  lateinit var answerClassificationController: AnswerClassificationController
+  @Inject lateinit var answerClassificationController: AnswerClassificationController
 
   @Before
   fun setUp() {
diff --git a/domain/src/test/java/org/oppia/domain/exploration/ExplorationDataControllerTest.kt b/domain/src/test/java/org/oppia/domain/exploration/ExplorationDataControllerTest.kt
index 6e5c8cfc903..fb0fc9f1563 100644
--- a/domain/src/test/java/org/oppia/domain/exploration/ExplorationDataControllerTest.kt
+++ b/domain/src/test/java/org/oppia/domain/exploration/ExplorationDataControllerTest.kt
@@ -72,8 +72,7 @@ class ExplorationDataControllerTest {
   @JvmField
   val executorRule = InstantTaskExecutorRule()
 
-  @Inject
-  lateinit var explorationDataController: ExplorationDataController
+  @Inject lateinit var explorationDataController: ExplorationDataController
 
   @Mock
   lateinit var mockExplorationObserver: Observer<AsyncResult<Exploration>>
diff --git a/domain/src/test/java/org/oppia/domain/exploration/ExplorationProgressControllerTest.kt b/domain/src/test/java/org/oppia/domain/exploration/ExplorationProgressControllerTest.kt
index 1c0961368e9..ea35a7a4bd6 100644
--- a/domain/src/test/java/org/oppia/domain/exploration/ExplorationProgressControllerTest.kt
+++ b/domain/src/test/java/org/oppia/domain/exploration/ExplorationProgressControllerTest.kt
@@ -77,14 +77,11 @@ class ExplorationProgressControllerTest {
   @JvmField
   val mockitoRule: MockitoRule = MockitoJUnit.rule()
 
-  @Inject
-  lateinit var explorationDataController: ExplorationDataController
+  @Inject lateinit var explorationDataController: ExplorationDataController
 
-  @Inject
-  lateinit var explorationProgressController: ExplorationProgressController
+  @Inject lateinit var explorationProgressController: ExplorationProgressController
 
-  @Inject
-  lateinit var explorationRetriever: ExplorationRetriever
+  @Inject lateinit var explorationRetriever: ExplorationRetriever
 
   @ExperimentalCoroutinesApi
   @Inject
diff --git a/domain/src/test/java/org/oppia/domain/profile/ProfileManagementControllerTest.kt b/domain/src/test/java/org/oppia/domain/profile/ProfileManagementControllerTest.kt
index 49db90742b6..ea0bf1cc0ee 100644
--- a/domain/src/test/java/org/oppia/domain/profile/ProfileManagementControllerTest.kt
+++ b/domain/src/test/java/org/oppia/domain/profile/ProfileManagementControllerTest.kt
@@ -58,11 +58,9 @@ class ProfileManagementControllerTest {
   @JvmField
   val mockitoRule: MockitoRule = MockitoJUnit.rule()
 
-  @Inject
-  lateinit var context: Context
+  @Inject lateinit var context: Context
 
-  @Inject
-  lateinit var profileManagementController: ProfileManagementController
+  @Inject lateinit var profileManagementController: ProfileManagementController
 
   @Mock
   lateinit var mockProfilesObserver: Observer<AsyncResult<List<Profile>>>
diff --git a/domain/src/test/java/org/oppia/domain/profile/ProfileTestHelperTest.kt b/domain/src/test/java/org/oppia/domain/profile/ProfileTestHelperTest.kt
index 9d024d2a8ce..eca4fd82eb6 100644
--- a/domain/src/test/java/org/oppia/domain/profile/ProfileTestHelperTest.kt
+++ b/domain/src/test/java/org/oppia/domain/profile/ProfileTestHelperTest.kt
@@ -53,14 +53,11 @@ class ProfileTestHelperTest {
   @JvmField
   val mockitoRule: MockitoRule = MockitoJUnit.rule()
 
-  @Inject
-  lateinit var context: Context
+  @Inject lateinit var context: Context
 
-  @Inject
-  lateinit var profileTestHelper: ProfileTestHelper
+  @Inject lateinit var profileTestHelper: ProfileTestHelper
 
-  @Inject
-  lateinit var profileManagementController: ProfileManagementController
+  @Inject lateinit var profileManagementController: ProfileManagementController
 
   @Mock
   lateinit var mockProfilesObserver: Observer<AsyncResult<List<Profile>>>
diff --git a/domain/src/test/java/org/oppia/domain/question/QuestionAssessmentProgressControllerTest.kt b/domain/src/test/java/org/oppia/domain/question/QuestionAssessmentProgressControllerTest.kt
index e3927adcb20..c09207b0275 100644
--- a/domain/src/test/java/org/oppia/domain/question/QuestionAssessmentProgressControllerTest.kt
+++ b/domain/src/test/java/org/oppia/domain/question/QuestionAssessmentProgressControllerTest.kt
@@ -54,11 +54,9 @@ class QuestionAssessmentProgressControllerTest {
   @JvmField
   val mockitoRule: MockitoRule = MockitoJUnit.rule()
 
-  @Inject
-  lateinit var questionTrainingController: QuestionTrainingController
+  @Inject lateinit var questionTrainingController: QuestionTrainingController
 
-  @Inject
-  lateinit var questionAssessmentProgressController: QuestionAssessmentProgressController
+  @Inject lateinit var questionAssessmentProgressController: QuestionAssessmentProgressController
 
   @Inject
   @field:TestDispatcher
diff --git a/domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt b/domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt
index 2826944900b..ab498bdf91e 100644
--- a/domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt
+++ b/domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt
@@ -66,8 +66,7 @@ class QuestionTrainingControllerTest {
   @JvmField
   val executorRule = InstantTaskExecutorRule()
 
-  @Inject
-  lateinit var questionTrainingController: QuestionTrainingController
+  @Inject lateinit var questionTrainingController: QuestionTrainingController
 
   @Mock
   lateinit var mockQuestionListObserver: Observer<AsyncResult<Any>>
diff --git a/domain/src/test/java/org/oppia/domain/topic/StoryProgressControllerTest.kt b/domain/src/test/java/org/oppia/domain/topic/StoryProgressControllerTest.kt
index 459ea9ddc75..f5d8e59e66a 100644
--- a/domain/src/test/java/org/oppia/domain/topic/StoryProgressControllerTest.kt
+++ b/domain/src/test/java/org/oppia/domain/topic/StoryProgressControllerTest.kt
@@ -33,8 +33,7 @@ import javax.inject.Singleton
 @RunWith(AndroidJUnit4::class)
 @Config(manifest = Config.NONE)
 class StoryProgressControllerTest {
-  @Inject
-  lateinit var storyProgressController: StoryProgressController
+  @Inject lateinit var storyProgressController: StoryProgressController
 
   @Before
   fun setUp() {
diff --git a/domain/src/test/java/org/oppia/domain/topic/TopicControllerTest.kt b/domain/src/test/java/org/oppia/domain/topic/TopicControllerTest.kt
index 47774cb3bab..79c5b902b02 100644
--- a/domain/src/test/java/org/oppia/domain/topic/TopicControllerTest.kt
+++ b/domain/src/test/java/org/oppia/domain/topic/TopicControllerTest.kt
@@ -58,8 +58,7 @@ import kotlin.coroutines.EmptyCoroutineContext
 @RunWith(AndroidJUnit4::class)
 @Config(manifest = Config.NONE)
 class TopicControllerTest {
-  @Inject
-  lateinit var topicController: TopicController
+  @Inject lateinit var topicController: TopicController
 
   @Rule
   @JvmField
@@ -75,8 +74,7 @@ class TopicControllerTest {
   @Captor
   lateinit var questionListResultCaptor: ArgumentCaptor<AsyncResult<List<Question>>>
 
-  @Inject
-  lateinit var dataProviders: DataProviders
+  @Inject lateinit var dataProviders: DataProviders
 
   @Inject
   @field:TestDispatcher
diff --git a/domain/src/test/java/org/oppia/domain/topic/TopicListControllerTest.kt b/domain/src/test/java/org/oppia/domain/topic/TopicListControllerTest.kt
index c53dec01214..9e929c5c2af 100644
--- a/domain/src/test/java/org/oppia/domain/topic/TopicListControllerTest.kt
+++ b/domain/src/test/java/org/oppia/domain/topic/TopicListControllerTest.kt
@@ -35,8 +35,7 @@ import javax.inject.Singleton
 @RunWith(AndroidJUnit4::class)
 @Config(manifest = Config.NONE)
 class TopicListControllerTest {
-  @Inject
-  lateinit var topicListController: TopicListController
+  @Inject lateinit var topicListController: TopicListController
 
   @Before
   fun setUp() {
diff --git a/utility/src/test/java/org/oppia/util/data/DataProvidersTest.kt b/utility/src/test/java/org/oppia/util/data/DataProvidersTest.kt
index c1eedae7589..df273eb3a54 100644
--- a/utility/src/test/java/org/oppia/util/data/DataProvidersTest.kt
+++ b/utility/src/test/java/org/oppia/util/data/DataProvidersTest.kt
@@ -56,11 +56,9 @@ class DataProvidersTest {
   @JvmField
   val mockitoRule: MockitoRule = MockitoJUnit.rule()
 
-  @Inject
-  lateinit var dataProviders: DataProviders
+  @Inject lateinit var dataProviders: DataProviders
 
-  @Inject
-  lateinit var asyncDataSubscriptionManager: AsyncDataSubscriptionManager
+  @Inject lateinit var asyncDataSubscriptionManager: AsyncDataSubscriptionManager
 
   @Inject
   @field:TestDispatcher
diff --git a/utility/src/test/java/org/oppia/util/data/InMemoryBlockingCacheTest.kt b/utility/src/test/java/org/oppia/util/data/InMemoryBlockingCacheTest.kt
index 46e977c7c72..2ef69a74d1f 100644
--- a/utility/src/test/java/org/oppia/util/data/InMemoryBlockingCacheTest.kt
+++ b/utility/src/test/java/org/oppia/util/data/InMemoryBlockingCacheTest.kt
@@ -38,8 +38,7 @@ private const val UPDATED_ASYNC_VALUE = "updated async value"
 @RunWith(AndroidJUnit4::class)
 @Config(manifest = Config.NONE)
 class InMemoryBlockingCacheTest {
-  @Inject
-  lateinit var cacheFactory: InMemoryBlockingCache.Factory
+  @Inject lateinit var cacheFactory: InMemoryBlockingCache.Factory
 
   @ExperimentalCoroutinesApi
   @Inject
diff --git a/utility/src/test/java/org/oppia/util/networking/NetworkConnectionUtilTest.kt b/utility/src/test/java/org/oppia/util/networking/NetworkConnectionUtilTest.kt
index c3207c60ef7..21138e8d937 100644
--- a/utility/src/test/java/org/oppia/util/networking/NetworkConnectionUtilTest.kt
+++ b/utility/src/test/java/org/oppia/util/networking/NetworkConnectionUtilTest.kt
@@ -42,12 +42,9 @@ class NetworkConnectionUtilTest {
 
   private val NO_CONNECTION = -1
 
-  @Inject
-  lateinit var networkConnectionUtil: NetworkConnectionUtil
+  @Inject lateinit var networkConnectionUtil: NetworkConnectionUtil
 
-
-  @Inject
-  lateinit var context: Context
+  @Inject lateinit var context: Context
 
   // https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-test/
   @ObsoleteCoroutinesApi
diff --git a/utility/src/test/java/org/oppia/util/profile/DirectoryManagementUtilTest.kt b/utility/src/test/java/org/oppia/util/profile/DirectoryManagementUtilTest.kt
index 1f2ecc48d38..1a6e685abbb 100644
--- a/utility/src/test/java/org/oppia/util/profile/DirectoryManagementUtilTest.kt
+++ b/utility/src/test/java/org/oppia/util/profile/DirectoryManagementUtilTest.kt
@@ -38,12 +38,9 @@ import javax.inject.Singleton
 @Config(manifest = Config.NONE)
 class DirectoryManagementUtilTest {
 
-  @Inject
-  lateinit var directoryManagementUtil: DirectoryManagementUtil
+  @Inject lateinit var directoryManagementUtil: DirectoryManagementUtil
 
-
-  @Inject
-  lateinit var context: Context
+  @Inject lateinit var context: Context
 
   // https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-test/
   @ObsoleteCoroutinesApi