diff --git a/libraries/stdlib/test/MapTest.kt b/libraries/stdlib/test/MapTest.kt
index 04696f08e0d..89b2b4b8330 100644
--- a/libraries/stdlib/test/MapTest.kt
+++ b/libraries/stdlib/test/MapTest.kt
@@ -8,7 +8,7 @@ import org.junit.Test as test
 class MapTest {
 
     test fun getOrElse() {
-        val data = HashMap<String, Int>()
+        val data = hashMapOf<String, Int>()
         val a = data.getOrElse("foo"){2}
         assertEquals(2, a)
 
@@ -16,13 +16,13 @@ class MapTest {
         assertEquals(3, b)
         assertEquals(0, data.size())
 
-        val empty = HashMap<String, Int?>()
+        val empty = hashMapOf<String, Int?>()
         val c = empty.getOrElse("") {null}
         assertEquals(null, c)
     }
 
     test fun getOrPut() {
-        val data = HashMap<String, Int>()
+        val data = hashMapOf<String, Int>()
         val a = data.getOrPut("foo"){2}
         assertEquals(2, a)
 
@@ -31,19 +31,19 @@ class MapTest {
 
         assertEquals(1, data.size())
 
-        val empty = HashMap<String, Int?>()
+        val empty = hashMapOf<String, Int?>()
         val c = empty.getOrPut("") {null}
         assertEquals(null, c)
     }
 
     test fun sizeAndEmpty() {
-        val data = HashMap<String, Int>()
+        val data = hashMapOf<String, Int>()
         assertTrue{ data.empty }
         assertEquals(data.size, 0)
     }
 
     test fun setViaIndexOperators() {
-        val map = HashMap<String, String>()
+        val map = hashMapOf<String, String>()
         assertTrue{ map.empty }
         assertEquals(map.size, 0)
 
@@ -60,7 +60,7 @@ class MapTest {
         map["location"] = "Mells"
         map["name"] = "James"
 
-        val list = arrayList<String>()
+        val list = arrayListOf<String>()
         for (e in map) {
             println("key = ${e.getKey()}, value = ${e.getValue()}")
             list.add(e.getKey())
@@ -77,7 +77,7 @@ class MapTest {
         map["location"] = "Mells"
         map["name"] = "James"
 
-        val list = arrayList<String>()
+        val list = arrayListOf<String>()
         for (e in map) {
             println("key = ${e.key}, value = ${e.value}")
             list.add(e.key)
@@ -94,7 +94,7 @@ class MapTest {
         map["location"] = "Mells"
         map["name"] = "James"
 
-        val list = arrayList<String>()
+        val list = arrayListOf<String>()
         for ((key, value) in map) {
             println("key = ${key}, value = ${value}")
             list.add(key)
@@ -113,7 +113,7 @@ class MapTest {
         val list = m1.map{ it.value + " rocks" }
 
         println("Got new list $list")
-        assertEquals(arrayList("beer rocks", "Mells rocks"), list)
+        assertEquals(arrayListOf("beer rocks", "Mells rocks"), list)
     }
 
     test fun mapValues() {
@@ -128,52 +128,52 @@ class MapTest {
     }
 
     test fun createUsingPairs() {
-        val map = hashMap(Pair("a", 1), Pair("b", 2))
+        val map = hashMapOf(Pair("a", 1), Pair("b", 2))
         assertEquals(2, map.size)
         assertEquals(1, map.get("a"))
         assertEquals(2, map.get("b"))
     }
 
     test fun createUsingTo() {
-        val map = hashMap("a" to 1, "b" to 2)
+        val map = hashMapOf("a" to 1, "b" to 2)
         assertEquals(2, map.size)
         assertEquals(1, map.get("a"))
         assertEquals(2, map.get("b"))
     }
 
     test fun createLinkedMap() {
-        val map = linkedMap(Pair("c", 3), Pair("b", 2), Pair("a", 1))
+        val map = linkedMapOf(Pair("c", 3), Pair("b", 2), Pair("a", 1))
         assertEquals(1, map.get("a"))
         assertEquals(2, map.get("b"))
         assertEquals(3, map.get("c"))
-        assertEquals(arrayList("c", "b", "a"), map.keySet().toList())
+        assertEquals(arrayListOf("c", "b", "a"), map.keySet().toList())
     }
 
     test fun createSortedMap() {
-        val map = sortedMap(Pair("c", 3), Pair("b", 2), Pair("a", 1))
+        val map = sortedMapOf(Pair("c", 3), Pair("b", 2), Pair("a", 1))
         assertEquals(1, map.get("a"))
         assertEquals(2, map.get("b"))
         assertEquals(3, map.get("c"))
-        assertEquals(arrayList("a", "b", "c"), map.keySet()!!.toList())
+        assertEquals(arrayListOf("a", "b", "c"), map.keySet().toList())
     }
 
     test fun toSortedMap() {
-        val map = hashMap<String,Int>(Pair("c", 3), Pair("b", 2), Pair("a", 1))
+        val map = hashMapOf<String,Int>(Pair("c", 3), Pair("b", 2), Pair("a", 1))
         val sorted = map.toSortedMap<String,Int>()
         assertEquals(1, sorted.get("a"))
         assertEquals(2, sorted.get("b"))
         assertEquals(3, sorted.get("c"))
-        assertEquals(arrayList("a", "b", "c"), sorted.keySet()!!.toList())
+        assertEquals(arrayListOf("a", "b", "c"), sorted.keySet().toList())
     }
 
     test fun toSortedMapWithComparator() {
-        val map = hashMap(Pair("c", 3), Pair("bc", 2), Pair("bd", 4), Pair("abc", 1))
+        val map = hashMapOf(Pair("c", 3), Pair("bc", 2), Pair("bd", 4), Pair("abc", 1))
         val c = comparator<String>{ a, b ->
             val answer = a.length() - b.length()
             if (answer == 0) a.compareTo(b) else answer
         }
         val sorted = map.toSortedMap(c)
-        assertEquals(arrayList("c", "bc", "bd", "abc"), sorted.keySet()!!.toList())
+        assertEquals(arrayListOf("c", "bc", "bd", "abc"), sorted.keySet().toList())
         assertEquals(1, sorted.get("abc"))
         assertEquals(2, sorted.get("bc"))
         assertEquals(3, sorted.get("c"))
@@ -189,7 +189,7 @@ class MapTest {
         map["location"] = "Mells"
         map["name"] = "James"
 
-        var list = arrayList<String>()
+        var list = arrayListOf<String>()
         for (e in map) {
             println("key = ${e.getKey()}, value = ${e.getValue()}")
             list += e.getKey()
@@ -203,7 +203,7 @@ class MapTest {
     */
 
     test fun toProperties() {
-        val map = hashMap("a" to "A", "b" to "B")
+        val map = hashMapOf("a" to "A", "b" to "B")
         val prop = map.toProperties()
         assertEquals(2, prop.size)
         assertEquals("A", prop.getProperty("a", "fail"))