diff --git a/nmslib_test.go b/nmslib_test.go
index 8523388..72e93f4 100644
--- a/nmslib_test.go
+++ b/nmslib_test.go
@@ -15,10 +15,20 @@ func TestPortal2Galactic(t *testing.T) {
 	} else {
 		fmt.Printf("Testing P2gc(\"006afa556c30\"): got: %q, want: %q.\n", want, "042F:0079:0D55:006A")
 	}
+
+	want, err = P2gc("41EDF9554C2F")
+	if err != nil {
+		panic(err)
+	}
+	if want != "042E:0078:0D53:01ED" {
+		t.Errorf("Testing P2gc(\"41EDF9554C2F\"): got %q, want: %q.\n", want, "042E:0078:0D53:01ED")
+	} else {
+		fmt.Printf("Testing P2gc(\"41EDF9554C2F\"): got: %q, want: %q.\n", want, "042E:0078:0D53:01ED")
+	}
 }
 
 func TestGalactic2portal(t *testing.T) {
-	want, err := Gc2p("042F:0079:0D55:006A")
+	want, err := Gc2p("042F:0079:0D55:006A", 1)
 	if err != nil {
 		panic(err)
 	}
@@ -28,14 +38,14 @@ func TestGalactic2portal(t *testing.T) {
 		fmt.Printf("Testing Gc2p(\"042F:0079:0D55:006A\"): got: %q, want: %q.\n", want, "106AFA556C30")
 	}
 
-	want, err = Gc2p("044B:0081:0D68:0096")
+	want, err = Gc2p("042E:0078:0D53:01ED", 4)
 	if err != nil {
 		panic(err)
 	}
-	if want != "109602569C4C" {
-		t.Errorf("Testing Gc2p(\"044B:0081:0D68:0096\"): got %q, want: %q.\n", want, "109602569C4C")
+	if want != "41EDF9554C2F" {
+		t.Errorf("Testing Gc2p(\"042E:0078:0D53:01ED\"): got %q, want: %q.\n", want, "41EDF9554C2F")
 	} else {
-		fmt.Printf("Testing Gc2p(\"044B:0081:0D68:0096\"): got: %q, want: %q.\n", want, "109602569C4C")
+		fmt.Printf("Testing Gc2p(\"042E:0078:0D53:01ED\"): got: %q, want: %q.\n", want, "41EDF9554C2F")
 	}
 }
 
@@ -45,11 +55,25 @@ func TestCreateBanner(t *testing.T) {
 }
 
 func TestKorvax2Eng(t *testing.T) {
-	want := Korvax2Eng("eapoluch")
-	if want != "emergency" {
-		t.Errorf("Testing Korvax2eng(\"eapoluch\"): got %q, want: %q.\n", want, "emergency")
+	want := Korvax2Eng("rodiashikhv")
+	if want != "contraband" {
+		t.Errorf("Testing Korvax2eng(\"rodiashikhv\"): got %q, want: %q.\n", want, "contraband")
 	} else {
-		fmt.Printf("Testing Korvax2eng(\"eapoluch\"): got %q, want: %q.\n", want, "emergency")
+		fmt.Printf("Testing Korvax2eng(\"rodiashikhv\"): got %q, want: %q.\n", want, "contraband")
+	}
+
+	want = Korvax2Eng("KIHTYOMOLES")
+	if want != "CONTRABAND" {
+		t.Errorf("Testing Korvax2eng(\"KIHTYOMOLES\"): got %q, want: %q.\n", want, "CONTRABAND")
+	} else {
+		fmt.Printf("Testing Korvax2eng(\"KIHTYOMOLES\"): got %q, want: %q.\n", want, "CONTRABAND")
+	}
+
+	want = Korvax2Eng("Zelidovoso")
+	if want != "Contraband" {
+		t.Errorf("Testing Korvax2eng(\"Zelidovoso\"): got %q, want: %q.\n", want, "Contraband")
+	} else {
+		fmt.Printf("Testing Korvax2eng(\"Zelidovoso\"): got %q, want: %q.\n", want, "Contraband")
 	}
 
 	want = Korvax2Eng("notaword")
@@ -61,11 +85,25 @@ func TestKorvax2Eng(t *testing.T) {
 }
 
 func TestEng2Korvax(t *testing.T) {
-	want := Eng2Korvax("emergency")
-	if want != "eapoluch" {
-		t.Errorf("Testing Eng2Korvax(\"emergency\"): got %q, want: %q.\n", want, "eapoluch")
+	want := Eng2Korvax("contraband")
+	if want != "rodiashikhv" {
+		t.Errorf("Testing Eng2Korvax(\"contraband\"): got %q, want: %q.\n", want, "rodiashikhv")
 	} else {
-		fmt.Printf("Testing Eng2Korvax(\"emergency\"): got %q, want: %q.\n", want, "eapoluch")
+		fmt.Printf("Testing Eng2Korvax(\"contraband\"): got %q, want: %q.\n", want, "rodiashikhv")
+	}
+
+	want = Eng2Korvax("CONTRABAND")
+	if want != "KIHTYOMOLES" {
+		t.Errorf("Testing Eng2Korvax(\"CONTRABAND\"): got %q, want: %q.\n", want, "KIHTYOMOLES")
+	} else {
+		fmt.Printf("Testing Eng2Korvax(\"CONTRABAND\"): got %q, want: %q.\n", want, "KIHTYOMOLES")
+	}
+
+	want = Eng2Korvax("Contraband")
+	if want != "Zelidovoso" {
+		t.Errorf("Testing Eng2Korvax(\"Contraband\"): got %q, want: %q.\n", want, "Zelidovoso")
+	} else {
+		fmt.Printf("Testing Eng2Korvax(\"Contraband\"): got %q, want: %q.\n", want, "Zelidovoso")
 	}
 
 	want = Eng2Korvax("notaword")
@@ -74,5 +112,6 @@ func TestEng2Korvax(t *testing.T) {
 	} else {
 		fmt.Printf("Testing Eng2Korvax(\"notaword\"): got %q, want: %q.\n", want, "*\\Kzzzzzzt\\*")
 	}
+
 	fmt.Printf("Testing: ")
 }