diff --git a/uci_dhcp_conf.go b/uci_dhcp_conf.go
index 8823994..cbe2ee9 100644
--- a/uci_dhcp_conf.go
+++ b/uci_dhcp_conf.go
@@ -36,7 +36,6 @@ func (dh *UCIDHCPConf) Create() *Action {
 		return result
 	}
 	for key, value := range conf {
-		fmt.Printf("DEBUG %s == %s\n", key, value)
 		if value == "" {
 			return &Action{
 				CommandResult: &CommandResult{
diff --git a/uci_dhcp_conf_test.go b/uci_dhcp_conf_test.go
index c47f2f7..9e15bbf 100644
--- a/uci_dhcp_conf_test.go
+++ b/uci_dhcp_conf_test.go
@@ -12,6 +12,7 @@ const (
 	ifNetmaskDHCP    = "255.255.255.0"
 	ifDNSDHCP        = "192.168.59.1"
 	ifIFTypeDHCP     = "bridge"
+	ifLeaseTimeDHCP  = "4h"
 	ifMetricDHCP     = "9000"
 	ifRangeLimitDHCP = "10"
 	ifStartIPDHCP    = "192.168.59.10"
@@ -31,7 +32,8 @@ func TestNetCreateWithDHCP(t *testing.T) {
 	iface.IFType = ifIFTypeDHCP
 	iface.Metric = ifMetricDHCP
 	iface.DHCP.Name = ifNameDHCP
-	iface.DHCP.LeaseTime = ifNameDHCP
+	iface.DHCP.IFName = ifIFNameDHCP
+	iface.DHCP.LeaseTime = ifLeaseTimeDHCP
 	iface.DHCP.RangeLimit = ifRangeLimitDHCP
 	iface.DHCP.StartIP = ifStartIPDHCP
 
@@ -54,19 +56,25 @@ func TestNetUpdateWithDHCP(t *testing.T) {
 	iface.IFType = ifIFTypeDHCP
 	iface.Metric = ifMetricDHCP
 	iface.DHCP.Name = ifNameDHCP
-	iface.DHCP.LeaseTime = ifNameDHCP
+	iface.DHCP.IFName = ifIFName
+	iface.DHCP.LeaseTime = ifLeaseTimeDHCP
 	iface.DHCP.RangeLimit = ifRangeLimitDHCP
 	iface.DHCP.StartIP = ifStartIPDHCP
 
-	if iface.Create().ReturnCode != 0 {
-		t.Fatalf("UCINetworkInterface.Create() failed !")
+	cr := iface.Create()
+	if cr.ReturnCode != 0 {
+		t.Fatalf("UCIDHCPConf.Create() failed !\n\tStdout: %s\n\tStderr: %s\n\tReturnCode: %d\n\tCommand: %s\n",
+			cr.Stdout,
+			cr.Stderr,
+			cr.ReturnCode,
+			cr.Command)
 	}
 
 	iface.Metric = "1000"
 	iface.DHCP.RangeLimit = "100"
 
 	if iface.Update().ReturnCode != 0 {
-		t.Fatalf("UCINetworkInterface.Update() failed !")
+		t.Fatalf("UCIDHCPConf.Update() failed !")
 	}
 }
 
@@ -84,7 +92,7 @@ func TestNetDeleteWithDHCP(t *testing.T) {
 	iface.IFType = ifIFTypeDHCP
 	iface.Metric = ifMetricDHCP
 	iface.DHCP.Name = ifNameDHCP
-	iface.DHCP.LeaseTime = ifNameDHCP
+	iface.DHCP.LeaseTime = ifLeaseTimeDHCP
 	iface.DHCP.RangeLimit = ifRangeLimitDHCP
 	iface.DHCP.StartIP = ifStartIPDHCP