diff --git a/ocpp-common/src/main/java/eu/chargetime/ocpp/ConfirmatinHandler.java b/ocpp-common/src/main/java/eu/chargetime/ocpp/ConfirmationHandler.java
similarity index 100%
rename from ocpp-common/src/main/java/eu/chargetime/ocpp/ConfirmatinHandler.java
rename to ocpp-common/src/main/java/eu/chargetime/ocpp/ConfirmationHandler.java
diff --git a/ocpp-common/src/main/java/eu/chargetime/ocpp/utilities/SugarUtil.java b/ocpp-common/src/main/java/eu/chargetime/ocpp/utilities/SugarUtil.java
index 2fb56b170..71b120e03 100644
--- a/ocpp-common/src/main/java/eu/chargetime/ocpp/utilities/SugarUtil.java
+++ b/ocpp-common/src/main/java/eu/chargetime/ocpp/utilities/SugarUtil.java
@@ -5,6 +5,7 @@
     MIT License
 
     Copyright (C) 2016-2018 Thomas Volden <tv@chargetime.eu>
+    Copyright (C) 2018 Mikhail Kladkevich <kladmv@ecp-share.com>
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
diff --git a/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/reservation/json/JSONReserveNowSpec.groovy b/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/reservation/json/JSONReserveNowSpec.groovy
index 578b3ab68..61f102a25 100644
--- a/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/reservation/json/JSONReserveNowSpec.groovy
+++ b/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/reservation/json/JSONReserveNowSpec.groovy
@@ -61,7 +61,7 @@ class JSONReserveNowSpec extends Specification {
         }
 
         when:
-        centralSystem.sendReserveNowRequest(1, Calendar.getInstance(), "123", 2)
+        centralSystem.sendReserveNowRequest(0, Calendar.getInstance(), "123", 2)
 
         then:
         conditions.eventually {
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowRequest.java
index 1682a1e83..f4ba14bcb 100644
--- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowRequest.java
+++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowRequest.java
@@ -61,7 +61,7 @@ public ReserveNowRequest(Integer connectorId, Calendar expiryDate, String idTag,
 
     @Override
     public boolean validate() {
-        boolean valid = connectorId != null && connectorId > 0;
+        boolean valid = connectorId != null && connectorId >= 0;
         valid &= expiryDate != null;
         valid &= ModelUtil.validate(idTag, 20);
         valid &= reservationId != null;
@@ -87,7 +87,7 @@ public Integer getConnectorId() {
      */
     @XmlElement
     public void setConnectorId(Integer connectorId) throws PropertyConstraintException {
-        if (connectorId <= 0)
+        if (connectorId < 0)
             throw new PropertyConstraintException("connectorId", connectorId);
 
         this.connectorId = connectorId;
diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientFirmwareManagementProfileTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientFirmwareManagementProfileTest.java
index 3bc701a09..54076e1e4 100644
--- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientFirmwareManagementProfileTest.java
+++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientFirmwareManagementProfileTest.java
@@ -59,14 +59,38 @@ public void setup() {
     }
 
     @Test
-    public void getFeatureList_containsAllNeededFeatures() {
+    public void getFeatureList_containsGetDiagnosticsFeature() {
         // When
         Feature[] features = profile.getFeatureList();
 
         // Then
         assertThat(findFeature(features, "GetDiagnostics"), is(instanceOf(GetDiagnosticsFeature.class)));
+    }
+
+    @Test
+    public void getFeatureList_containsDiagnosticsStatusNotificationFeature() {
+        // When
+        Feature[] features = profile.getFeatureList();
+
+        // Then
         assertThat(findFeature(features, "DiagnosticsStatusNotification"), is(instanceOf(DiagnosticsStatusNotificationFeature.class)));
+    }
+
+    @Test
+    public void getFeatureList_containsFirmwareStatusNotificationFeature() {
+        // When
+        Feature[] features = profile.getFeatureList();
+
+        // Then
         assertThat(findFeature(features, "FirmwareStatusNotification"), is(instanceOf(FirmwareStatusNotificationFeature.class)));
+    }
+
+    @Test
+    public void getFeatureList_containsUpdateFirmwareFeature() {
+        // When
+        Feature[] features = profile.getFeatureList();
+
+        // Then
         assertThat(findFeature(features, "UpdateFirmware"), is(instanceOf(UpdateFirmwareFeature.class)));
     }
 
diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientReservationProfileTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientReservationProfileTest.java
index 769c5661f..1f7ecefdb 100644
--- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientReservationProfileTest.java
+++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientReservationProfileTest.java
@@ -61,12 +61,20 @@ public void setup() {
     }
 
     @Test
-    public void getFeatureList_containsAllNeededFeatures() {
+    public void getFeatureList_containsReserveNowFeature() {
         // When
         Feature[] features = profile.getFeatureList();
 
         // Then
         assertThat(findFeature(features, "ReserveNow"), is(instanceOf(ReserveNowFeature.class)));
+    }
+
+    @Test
+    public void getFeatureList_containsCancelReservationFeature() {
+        // When
+        Feature[] features = profile.getFeatureList();
+
+        // Then
         assertThat(findFeature(features, "CancelReservation"), is(instanceOf(CancelReservationFeature.class)));
     }
 
diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerFirmwareManagementProfileTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerFirmwareManagementProfileTest.java
index 20307ff02..0b46cdab5 100644
--- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerFirmwareManagementProfileTest.java
+++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerFirmwareManagementProfileTest.java
@@ -48,15 +48,40 @@ public void setup() {
     }
 
     @Test
-    public void getFeatureList_containsAllNeededFeatures() {
+    public void getFeatureList_containsGetDiagnosticsFeature() {
         // When
         Feature[] features = profile.getFeatureList();
 
         // Then
         assertThat(findFeature(features, "GetDiagnostics"), Is.is(instanceOf(GetDiagnosticsFeature.class)));
+    }
+
+    @Test
+    public void getFeatureList_containsDiagnosticsStatusNotificationFeature() {
+        // When
+        Feature[] features = profile.getFeatureList();
+
+        // Then
         assertThat(findFeature(features, "DiagnosticsStatusNotification"), Is.is(instanceOf(DiagnosticsStatusNotificationFeature.class)));
+    }
+
+    @Test
+    public void getFeatureList_containsFirmwareStatusNotificationFeature() {
+        // When
+        Feature[] features = profile.getFeatureList();
+
+        // Then
         assertThat(findFeature(features, "FirmwareStatusNotification"), Is.is(instanceOf(FirmwareStatusNotificationFeature.class)));
+    }
+
+    @Test
+    public void getFeatureList_containsUpdateFirmwareFeature() {
+        // When
+        Feature[] features = profile.getFeatureList();
+
+        // Then
         assertThat(findFeature(features, "UpdateFirmware"), Is.is(instanceOf(UpdateFirmwareFeature.class)));
     }
 
+
 }
\ No newline at end of file
diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerLocalAuthListProfileTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerLocalAuthListProfileTest.java
index b0703e0dc..31129ce8e 100644
--- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerLocalAuthListProfileTest.java
+++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerLocalAuthListProfileTest.java
@@ -50,12 +50,21 @@ public void setup() {
     }
 
     @Test
-    public void getFeatureList_containsAllNeededFeatures() {
+    public void getFeatureList_containsGetLocalListVersionFeature() {
         // When
         Feature[] featureList = profile.getFeatureList();
 
         // Then
         assertThat(findFeature(featureList, "GetLocalListVersion"), CoreMatchers.is(instanceOf(GetLocalListVersionFeature.class)));
+    }
+
+
+    @Test
+    public void getFeatureList_containsSendLocalListFeature() {
+        // When
+        Feature[] featureList = profile.getFeatureList();
+
+        // Then
         assertThat(findFeature(featureList, "SendLocalList"), CoreMatchers.is(instanceOf(SendLocalListFeature.class)));
     }
 
diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerReservationProfileTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerReservationProfileTest.java
index 300818d0c..f40371e1d 100644
--- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerReservationProfileTest.java
+++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerReservationProfileTest.java
@@ -49,12 +49,20 @@ public void setup() {
     }
 
     @Test
-    public void getFeatureList_containsAllNeededFeatures() {
+    public void getFeatureList_containsReserveNowFeature() {
         // When
         Feature[] features = profile.getFeatureList();
 
         // Then
         assertThat(findFeature(features, "ReserveNow"), Is.is(instanceOf(ReserveNowFeature.class)));
+    }
+
+    @Test
+    public void getFeatureList_containsCancelReservationFeature() {
+        // When
+        Feature[] features = profile.getFeatureList();
+
+        // Then
         assertThat(findFeature(features, "CancelReservation"), is(instanceOf(CancelReservationFeature.class)));
     }
 
diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/reservation/test/ReserveNowRequestTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/reservation/test/ReserveNowRequestTest.java
index e44910848..7407c8f74 100644
--- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/reservation/test/ReserveNowRequestTest.java
+++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/reservation/test/ReserveNowRequestTest.java
@@ -57,7 +57,7 @@ public void validate_statusIsNotSet_returnsFalse() {
     @Test
     public void validate_requiredFieldsAreSet_returnTrue() throws PropertyConstraintException {
         // Given
-        Integer connectorId = 1;
+        Integer connectorId = 0;
         Calendar expiryDate = Calendar.getInstance();
         String idTag = "row";
         Integer reservationId = 2;