diff --git a/README b/README
index aee897036..44b655246 100644
--- a/README
+++ b/README
@@ -7,7 +7,7 @@
         Copyright 2014-2015 / Florent Kermarrec / florent@enjoy-digital.fr
 
                 A lite open-source SATA1/2/3 controller
-	     developed in partnership with M-Labs Ltd / HKU
+            developed in partnership with M-Labs Ltd / HKU
 --------------------------------------------------------------------------------
 
 [> Getting started
diff --git a/test/test_bist_mila.py b/test/test_bist_mila.py
deleted file mode 100644
index b27897ea4..000000000
--- a/test/test_bist_mila.py
+++ /dev/null
@@ -1,43 +0,0 @@
-import time
-from config import *
-from tools import *
-from bist import *
-from miscope.host.drivers import MiLaDriver
-
-mila = MiLaDriver(wb.regs, "mila")
-generator = SATABISTGeneratorDriver(wb.regs, "sata_bist")
-checker = SATABISTCheckerDriver(wb.regs, "sata_bist")
-wb.open()
-regs = wb.regs
-###
-
-wr_cond = {
-	"sata_con_source_source_stb"			: 1,
-	"sata_con_source_source_payload_write"	: 1,
-}
-
-rd_cond = {
-	"sata_con_source_source_stb"			: 1,
-	"sata_con_source_source_payload_read"	: 1,
-}
-
-
-mila.prog_term(port=0, cond=rd_cond)
-mila.prog_sum("term")
-
-# Trigger / wait / receive
-mila.trigger(offset=32, length=1024)
-
-generator.run(0, 16, 1, 0)
-checker.run(0, 16, 1, 0)
-mila.wait_done()
-
-mila.read()
-mila.export("dump.vcd")
-###
-wb.close()
-
-print_link_trace(mila,
-	tx_data_name="sata_phy_sink_sink_payload_data",
-	rx_data_name="sata_phy_source_source_payload_data"
-)
diff --git a/test/test_link.py b/test/test_link.py
new file mode 100644
index 000000000..0c10f48d8
--- /dev/null
+++ b/test/test_link.py
@@ -0,0 +1,54 @@
+import sys
+from config import *
+from tools import *
+from bist import *
+from miscope.host.drivers import MiLaDriver
+
+mila = MiLaDriver(wb.regs, "mila")
+generator = SATABISTGeneratorDriver(wb.regs, "sata_bist")
+checker = SATABISTCheckerDriver(wb.regs, "sata_bist")
+wb.open()
+regs = wb.regs
+###
+
+if len(sys.argv) < 2:
+	print("Need trigger condition!")
+	sys.exit(0)
+
+conditions = {}
+conditions["wr_cmd"] = {
+	"bistsocdevel_sata_con_command_sink_stb"			: 1,
+	"bistsocdevel_sata_con_command_sink_payload_write"	: 1,
+}
+conditions["wr_dma_activate"] = {
+	"bistsocdevel_sata_con_command_source_source_stb"			: 1,
+	"bistsocdevel_sata_con_command_source_source_payload_write"	: 1,
+}
+conditions["rd_cmd"] = {
+	"bistsocdevel_sata_con_command_sink_stb"			: 1,
+	"bistsocdevel_sata_con_command_sink_payload_read"	: 1,
+}
+conditions["rd_data"] = {
+	"bistsocdevel_sata_con_command_source_source_stb"			: 1,
+	"bistsocdevel_sata_con_command_source_source_payload_read"	: 1,
+}
+
+mila.prog_term(port=0, cond=conditions[sys.argv[1]])
+mila.prog_sum("term")
+
+# Trigger / wait / receive
+mila.trigger(offset=512, length=2000)
+
+generator.run(0, 2, 0)
+checker.run(0, 2, 0)
+mila.wait_done()
+
+mila.read()
+mila.export("dump.vcd")
+###
+wb.close()
+
+print_link_trace(mila,
+	tx_data_name="bistsocdevel_sata_phy_sink_sink_payload_data",
+	rx_data_name="bistsocdevel_sata_phy_source_source_payload_data"
+)
diff --git a/test/tools.py b/test/tools.py
index 3c362fc7d..1e8411af6 100644
--- a/test/tools.py
+++ b/test/tools.py
@@ -33,6 +33,7 @@ def print_link_trace(mila, tx_data_name, rx_data_name):
 		if var.name == rx_data_name:
 			rx_data = var.values
 
+	print("")
 	for i in range(len(tx_data)):
 		tx = "%08x " %tx_data[i]
 		tx += decode_primitive(tx_data[i])