diff --git a/core-kotlin-modules/core-kotlin-lang-oop-2/pom.xml b/core-kotlin-modules/core-kotlin-lang-oop-2/pom.xml
index f0adea121e..f952911ae1 100644
--- a/core-kotlin-modules/core-kotlin-lang-oop-2/pom.xml
+++ b/core-kotlin-modules/core-kotlin-lang-oop-2/pom.xml
@@ -22,4 +22,57 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib-jdk8</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib-jdk7</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib-common</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-reflect</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-test-junit</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-test</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-test-common</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-test-annotations-common</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <properties>
+        <kotlin.version>1.4.10</kotlin.version>
+    </properties>
+</project>
diff --git a/core-kotlin-modules/core-kotlin-lang-oop-2/src/test/kotlin/com/baeldung/kotlin/delegates/DelegateProviderTest.kt b/core-kotlin-modules/core-kotlin-lang-oop-2/src/test/kotlin/com/baeldung/kotlin/delegates/DelegateProviderTest.kt
new file mode 100644
index 0000000000..2959ea0e3c
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin-lang-oop-2/src/test/kotlin/com/baeldung/kotlin/delegates/DelegateProviderTest.kt
@@ -0,0 +1,42 @@
+package com.baeldung.kotlin.delegates
+
+import org.junit.Test
+import kotlin.properties.PropertyDelegateProvider
+import kotlin.reflect.KProperty
+import kotlin.test.assertEquals
+
+class DelegateProvider<in T, D>(private val field: String, private val id: Int)
+    : PropertyDelegateProvider<T, DatabaseDelegate<T, D>> {
+    override operator fun provideDelegate(thisRef: T, prop: KProperty<*>): DatabaseDelegate<T, D> {
+        println("Providing delegate for field $field and ID $id")
+        prop.returnType.isMarkedNullable
+        return DatabaseDelegate(field, id)
+    }
+}
+
+class DelegateProvidingUser(val id: Int) {
+    var name: String by DelegateProvider("name", id)
+    var age: Int by DelegateProvider("age", id)
+}
+
+class DelegateProviderTest {
+    @Test
+    fun testGetKnownFields() {
+        val user = DelegateProvidingUser(1)
+        assertEquals("George", user.name)
+        assertEquals(4, user.age)
+    }
+
+    @Test
+    fun testSetKnownFields() {
+        val user = DelegateProvidingUser(2)
+        user.age = 3
+        assertEquals(3, user.age)
+    }
+
+    @Test(expected = NoRecordFoundException::class)
+    fun testGetKnownField() {
+        val user = DelegateProvidingUser(3)
+        user.name
+    }
+}