diff --git a/.gitignore b/.gitignore
index a767f1c..124a8d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,3 @@
 *.xml
 *.pyc
 *.swp
-
-# IDEs
-.idea
\ No newline at end of file
diff --git a/tests/data/bbsim-kind-16.yaml b/tests/data/bbsim-kind-16.yaml
index 7e17808..836e484 100644
--- a/tests/data/bbsim-kind-16.yaml
+++ b/tests/data/bbsim-kind-16.yaml
@@ -30,7 +30,7 @@
 
 olts:
   -
-    ip: bbsim0
+    ip: bbsim
     serial: BBSIM_OLT_0
 
 hosts:
diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
index a2dff34..018aa78 100644
--- a/tests/data/bbsim-kind-2x2.yaml
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -29,7 +29,7 @@
 
 olts:
   -
-    ip: bbsim0
+    ip: bbsim
     serial: BBSIM_OLT_0
 
 hosts:
diff --git a/tests/data/bbsim-kind-8x2.yaml b/tests/data/bbsim-kind-8x2.yaml
index 4b6810a..baddfc9 100644
--- a/tests/data/bbsim-kind-8x2.yaml
+++ b/tests/data/bbsim-kind-8x2.yaml
@@ -30,7 +30,7 @@
 
 olts:
   -
-    ip: bbsim0
+    ip: bbsim
     serial: BBSIM_OLT_0
 
 hosts:
diff --git a/tests/data/bbsim-kind-dt.yaml b/tests/data/bbsim-kind-dt.yaml
index a1f5ace..1e9b2fe 100644
--- a/tests/data/bbsim-kind-dt.yaml
+++ b/tests/data/bbsim-kind-dt.yaml
@@ -30,7 +30,7 @@
 
 olts:
   -
-    ip: bbsim0
+    ip: bbsim
     serial: BBSIM_OLT_0
 
 hosts:
diff --git a/tests/data/bbsim-kind.yaml b/tests/data/bbsim-kind.yaml
index f0f948c..a65d0fb 100644
--- a/tests/data/bbsim-kind.yaml
+++ b/tests/data/bbsim-kind.yaml
@@ -29,7 +29,7 @@
 
 olts:
   -
-    ip: bbsim0
+    ip: bbsim
     serial: BBSIM_OLT_0
 
 hosts: