Adding more UTs

Raising the code coverage in the project

Change-Id: Id962d5bd3bd9a1a51f0f4ad0d52e7da51dd3bad1
Issue-ID: SDC-1872
Signed-off-by: Eran (ev672n), Vosk <ev672n@att.com>

69 files changed, 866 insertions, 24 deletions

diff --git a/src/test/java/org/onap/sdc/common/onaplog/OnapLoggerAuditTest.java b/src/test/java/org/onap/sdc/common/onaplog/OnapLoggerAuditTest.java
index 6488739..1d81321 100644
--- a/src/test/java/org/onap/sdc/common/onaplog/OnapLoggerAuditTest.java
+++ b/src/test/java/org/onap/sdc/common/onaplog/OnapLoggerAuditTest.java
@@ -2,7 +2,7 @@ package org.onap.sdc.common.onaplog;
 
 import org.junit.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static com.google.code.beanmatchers.BeanMatchers.*;
 import static org.junit.Assert.*;
 
 public class OnapLoggerAuditTest {
@@ -11,4 +11,19 @@ public class OnapLoggerAuditTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(OnapLoggerAudit.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void checkEquals() {
+		assertThat(OnapLoggerAudit.class, hasValidBeanEquals());
+	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(OnapLoggerAudit.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(OnapLoggerAudit.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/AssignmentTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/AssignmentTest.java
index 354f921..3124011 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/AssignmentTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/AssignmentTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class AssignmentTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Assignment.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+ 	public void testHasValidConstructor() {
+		assertThat(Assignment.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Assignment.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/CapabilityTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/CapabilityTest.java
index 7a3267d..3c3321d 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/CapabilityTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/CapabilityTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class CapabilityTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Capability.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Capability.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Capability.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/Capability_Test.java b/src/test/java/org/onap/sdc/dcae/composition/model/Capability_Test.java
index 6509665..9ca7b32 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/Capability_Test.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/Capability_Test.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class Capability_Test {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Capability_.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Capability_.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Capability_.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/Capability__Test.java b/src/test/java/org/onap/sdc/dcae/composition/model/Capability__Test.java
index c0f1781..583cca8 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/Capability__Test.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/Capability__Test.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class Capability__Test {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Capability__.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Capability__.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Capability__.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/DataTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/DataTest.java
index 3ad2dc9..4e92ce2 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/DataTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/DataTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class DataTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Data.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Data.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Data.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/DcaeCapabilitiesStreamSubscribeTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/DcaeCapabilitiesStreamSubscribeTest.java
index 02f8caf..b075dca 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/DcaeCapabilitiesStreamSubscribeTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/DcaeCapabilitiesStreamSubscribeTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class DcaeCapabilitiesStreamSubscribeTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(DcaeCapabilitiesStreamSubscribe.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(DcaeCapabilitiesStreamSubscribe.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(DcaeCapabilitiesStreamSubscribe.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/FormatTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/FormatTest.java
index 2068c41..3620cd4 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/FormatTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/FormatTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class FormatTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Format.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Format.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Format.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/ModelDcaeTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/ModelDcaeTest.java
index 07a77ae..7f60f3e 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/ModelDcaeTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/ModelDcaeTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ModelDcaeTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(ModelDcae.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(ModelDcae.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(ModelDcae.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/ModelTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/ModelTest.java
index fdc9d71..a7cd97d 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/ModelTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/ModelTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ModelTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Model.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Model.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Model.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/NodeFilterTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/NodeFilterTest.java
index 890bc98..2e6a568 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/NodeFilterTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/NodeFilterTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class NodeFilterTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(NodeFilter.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(NodeFilter.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(NodeFilter.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/NodeTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/NodeTest.java
index 836e6a8..92f7628 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/NodeTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/NodeTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class NodeTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Node.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Node.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Node.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/PropertyTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/PropertyTest.java
index 3b15085..da51975 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/PropertyTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/PropertyTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class PropertyTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Property.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Property.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Property.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/Property_Test.java b/src/test/java/org/onap/sdc/dcae/composition/model/Property_Test.java
index d2ec1e3..8cc0cdc 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/Property_Test.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/Property_Test.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class Property_Test {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Property_.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Property_.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Property_.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/RelationshipTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/RelationshipTest.java
index 4a5ed0f..39d027c 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/RelationshipTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/RelationshipTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class RelationshipTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Relationship.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Relationship.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Relationship.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/RequirementTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/RequirementTest.java
index 51d8fce..1cd62c2 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/RequirementTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/RequirementTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class RequirementTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Requirement.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Requirement.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Requirement.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/TypeTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/TypeTest.java
index 0027964..b0e3983 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/TypeTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/TypeTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class TypeTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Type.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Type.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Type.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/ValueTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/ValueTest.java
index 32ebcae..2dad232 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/ValueTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/ValueTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ValueTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Value.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Value.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Value.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/VersionTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/VersionTest.java
index 194fee0..b3dbd15 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/model/VersionTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/VersionTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.model;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class VersionTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Version.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Version.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Version.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/AttachVFCMTServiceRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/AttachVFCMTServiceRequestTest.java
index c0001fb..75dca65 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/AttachVFCMTServiceRequestTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/AttachVFCMTServiceRequestTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class AttachVFCMTServiceRequestTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(AttachVFCMTServiceRequest.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(AttachVFCMTServiceRequest.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(AttachVFCMTServiceRequest.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionRequestTest.java
index c3ec5c1..126634e 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionRequestTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionRequestTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class CompositionRequestTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(CompositionRequest.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(CompositionRequest.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(CompositionRequest.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionTest.java
index 198990a..32e5e67 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class CompositionTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Composition.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Composition.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Composition.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateMcResponseTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateMcResponseTest.java
index 15fab6c..859e802 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateMcResponseTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateMcResponseTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class CreateMcResponseTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(CreateMcResponse.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(CreateMcResponse.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(CreateMcResponse.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateVFCMTRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateVFCMTRequestTest.java
index 4299cd0..fa8f807 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateVFCMTRequestTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateVFCMTRequestTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class CreateVFCMTRequestTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(CreateVFCMTRequest.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(CreateVFCMTRequest.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(CreateVFCMTRequest.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/DcaeMinimizedServiceTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/DcaeMinimizedServiceTest.java
index acaaa07..7930602 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/DcaeMinimizedServiceTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/DcaeMinimizedServiceTest.java
@@ -4,7 +4,6 @@ import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 public class DcaeMinimizedServiceTest {
 
@@ -51,6 +50,4 @@ public class DcaeMinimizedServiceTest {
         assertEquals(VERSION + "1", classUnderTest.getVersion());
         assertEquals(INVARIANT_UUID + "1", classUnderTest.getInvariantUUID());
     }
-
-
 }
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ImportVFCMTRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ImportVFCMTRequestTest.java
index 7582d7a..90cd300 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ImportVFCMTRequestTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ImportVFCMTRequestTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ImportVFCMTRequestTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(ImportVFCMTRequest.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(ImportVFCMTRequest.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(ImportVFCMTRequest.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/MessageResponseTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/MessageResponseTest.java
index 7fceb2a..f6680c5 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/MessageResponseTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/MessageResponseTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class MessageResponseTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(MessageResponse.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(MessageResponse.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(MessageResponse.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/MonitoringComponentTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/MonitoringComponentTest.java
index 5fecbd8..c601052 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/MonitoringComponentTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/MonitoringComponentTest.java
@@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.restmodels;
 
 import org.junit.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static com.google.code.beanmatchers.BeanMatchers.*;
 import static org.junit.Assert.*;
 
 public class MonitoringComponentTest {
@@ -11,4 +11,19 @@ public class MonitoringComponentTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(MonitoringComponent.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void checkEquals() {
+		assertThat(MonitoringComponent.class, hasValidBeanEquals());
+	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(MonitoringComponent.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(MonitoringComponent.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ReferenceUUIDTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ReferenceUUIDTest.java
index 60b653a..384cb3e 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ReferenceUUIDTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ReferenceUUIDTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ReferenceUUIDTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(ReferenceUUID.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(ReferenceUUID.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(ReferenceUUID.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/VfcmtDataTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/VfcmtDataTest.java
index 836f30a..3b22405 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/VfcmtDataTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/VfcmtDataTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class VfcmtDataTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(VfcmtData.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(VfcmtData.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(VfcmtData.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/canvas/DcaeComponentCatalogTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/canvas/DcaeComponentCatalogTest.java
index 2f02550..1bca510 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/canvas/DcaeComponentCatalogTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/canvas/DcaeComponentCatalogTest.java
@@ -2,11 +2,11 @@ package org.onap.sdc.dcae.composition.restmodels.canvas;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
-
-
 public class DcaeComponentCatalogTest {
 
 	@Test
@@ -14,4 +14,13 @@ public class DcaeComponentCatalogTest {
 		assertThat(DcaeComponentCatalog.class, hasValidGettersAndSetters());
 	}
 
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(DcaeComponentCatalog.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(DcaeComponentCatalog.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/canvas/SubCategoryFolderTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/canvas/SubCategoryFolderTest.java
index bc2c2d5..708f2d0 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/canvas/SubCategoryFolderTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/canvas/SubCategoryFolderTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.canvas;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.assertThat;
 
@@ -9,4 +11,14 @@ public class SubCategoryFolderTest {
     @Test
     public void shouldHaveValidGettersAndSetters() {
         assertThat(DcaeComponentCatalog.SubCategoryFolder.class, hasValidGettersAndSetters()); }
+
+    @Test
+    public void testHasValidConstructor() {
+        assertThat(DcaeComponentCatalog.SubCategoryFolder.class, hasValidBeanConstructor());
+    }
+
+    @Test
+    public void checkHashCodeFor() {
+        assertThat(DcaeComponentCatalog.SubCategoryFolder.class, hasValidBeanHashCodeFor());
+    }
 }
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/ComponentsInfoTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/ComponentsInfoTest.java
index 19a748b..5bcb860 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/ComponentsInfoTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/ComponentsInfoTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.health;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -12,4 +14,13 @@ public class ComponentsInfoTest {
 		assertThat(ComponentsInfo.class, hasValidGettersAndSetters());
 	}
 
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(ComponentsInfo.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(ComponentsInfo.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/HealthResponseTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/HealthResponseTest.java
index c1616e3..7cc9613 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/HealthResponseTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/HealthResponseTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.health;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -12,4 +14,14 @@ public class HealthResponseTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(HealthResponse.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(HealthResponse.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(HealthResponse.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ApplyFilterRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ApplyFilterRequestTest.java
index dd88ada..03dd15d 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ApplyFilterRequestTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ApplyFilterRequestTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -12,4 +14,14 @@ public class ApplyFilterRequestTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(ApplyFilterRequest.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(ApplyFilterRequest.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(ApplyFilterRequest.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/BaseCopyActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/BaseCopyActionTest.java
index e21875c..1af2b15 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/BaseCopyActionTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/BaseCopyActionTest.java
@@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static com.google.code.beanmatchers.BeanMatchers.*;
 import static org.junit.Assert.*;
 
 
@@ -12,4 +12,19 @@ public class BaseCopyActionTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(BaseCopyAction.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void checkEquals() {
+		assertThat(BaseCopyAction.class, hasValidBeanEquals());
+	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(BaseCopyAction.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(BaseCopyAction.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionGroupTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionGroupTest.java
index 883e8c9..c171350 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionGroupTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionGroupTest.java
@@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static com.google.code.beanmatchers.BeanMatchers.*;
 import static org.junit.Assert.*;
 
 
@@ -12,4 +12,19 @@ public class ConditionGroupTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(ConditionGroup.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void checkEquals() {
+		assertThat(ConditionGroup.class, hasValidBeanEquals());
+	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(ConditionGroup.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(ConditionGroup.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionTest.java
index 191e10e..5059d40 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionTest.java
@@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static com.google.code.beanmatchers.BeanMatchers.*;
 import static org.junit.Assert.*;
 
 
@@ -12,4 +12,19 @@ public class ConditionTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Condition.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void checkEquals() {
+		assertThat(Condition.class, hasValidBeanEquals());
+	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Condition.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Condition.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypeDefinitionUITest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypeDefinitionUITest.java
index 28fd2c6..df583d4 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypeDefinitionUITest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypeDefinitionUITest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class EventTypeDefinitionUITest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(EventTypeDefinitionUI.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(EventTypeDefinitionUI.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(EventTypeDefinitionUI.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypesByVersionUITest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypesByVersionUITest.java
index 0b7a692..e845ab2 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypesByVersionUITest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypesByVersionUITest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class EventTypesByVersionUITest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(EventTypesByVersionUI.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(EventTypesByVersionUI.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(EventTypesByVersionUI.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/HpMetricActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/HpMetricActionTest.java
index 130e418..f8bc8ec 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/HpMetricActionTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/HpMetricActionTest.java
@@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static com.google.code.beanmatchers.BeanMatchers.*;
 import static org.junit.Assert.*;
 
 public class HpMetricActionTest {
@@ -11,4 +11,19 @@ public class HpMetricActionTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(HpMetricAction.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void checkEquals() {
+		assertThat(HpMetricAction.class, hasValidBeanEquals());
+	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(HpMetricAction.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(HpMetricAction.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ImportPhaseRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ImportPhaseRequestTest.java
index 45d7556..a8d2df1 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ImportPhaseRequestTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ImportPhaseRequestTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ImportPhaseRequestTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(ImportPhaseRequest.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(ImportPhaseRequest.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(ImportPhaseRequest.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogEventActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogEventActionTest.java
index d17085d..52437f7 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogEventActionTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogEventActionTest.java
@@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static com.google.code.beanmatchers.BeanMatchers.*;
 import static org.junit.Assert.*;
 
 public class LogEventActionTest {
@@ -11,4 +11,19 @@ public class LogEventActionTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(LogEventAction.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void checkEquals() {
+		assertThat(LogEventAction.class, hasValidBeanEquals());
+	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(LogEventAction.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(LogEventAction.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogTextActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogTextActionTest.java
index b55138e..3fde15f 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogTextActionTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogTextActionTest.java
@@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static com.google.code.beanmatchers.BeanMatchers.*;
 import static org.junit.Assert.*;
 
 public class LogTextActionTest {
@@ -11,4 +11,19 @@ public class LogTextActionTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(LogTextAction.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void checkEquals() {
+		assertThat(LogTextAction.class, hasValidBeanEquals());
+	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(LogTextAction.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(LogTextAction.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/MappingRulesTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/MappingRulesTest.java
index a8a15d3..705ef6a 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/MappingRulesTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/MappingRulesTest.java
@@ -2,17 +2,19 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.sdc.dcae.composition.restmodels.DcaeMinimizedService;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 
 public class MappingRulesTest {
 
-    public static final String ENTRY_PHASE = "entryPhase";
-    public static final String PUBLISH_PHASE = "publishPhase";
-    public static final String VERSION = "1.1";
-    public static final String EVENT_TYPE = "eventType";
-    public static final String NOTIFY_ID = "notifyId";
+    private static final String ENTRY_PHASE = "entryPhase";
+    private static final String PUBLISH_PHASE = "publishPhase";
+    private static final String VERSION = "1.1";
+    private static final String EVENT_TYPE = "eventType";
+    private static final String NOTIFY_ID = "notifyId";
     private MappingRules classUnderTest;
 
     @Before
@@ -34,4 +36,14 @@ public class MappingRulesTest {
         assertEquals(EVENT_TYPE, classUnderTest.getEventType());
         assertEquals(NOTIFY_ID, classUnderTest.getNotifyId());
     }
+
+    @Test
+    public void testHasValidConstructor() {
+        assertThat(MappingRules.class, hasValidBeanConstructor());
+    }
+
+    @Test
+    public void checkHashCodeFor() {
+        assertThat(MappingRules.class, hasValidBeanHashCodeFor());
+    }
 }
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ReplaceTextActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ReplaceTextActionTest.java
index 2b6c9ee..97428d9 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ReplaceTextActionTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ReplaceTextActionTest.java
@@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static com.google.code.beanmatchers.BeanMatchers.*;
 import static org.junit.Assert.*;
 
 public class ReplaceTextActionTest {
@@ -11,4 +11,19 @@ public class ReplaceTextActionTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(ReplaceTextAction.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void checkEquals() {
+		assertThat(ReplaceTextAction.class, hasValidBeanEquals());
+	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(ReplaceTextAction.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(ReplaceTextAction.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/RuleEditorRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/RuleEditorRequestTest.java
index b50309d..d9161fb 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/RuleEditorRequestTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/RuleEditorRequestTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class RuleEditorRequestTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(RuleEditorRequest.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(RuleEditorRequest.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(RuleEditorRequest.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/SchemaInfoTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/SchemaInfoTest.java
index ece2dbc..6241d46 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/SchemaInfoTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/SchemaInfoTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class SchemaInfoTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(SchemaInfo.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(SchemaInfo.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(SchemaInfo.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/StringTransformActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/StringTransformActionTest.java
index f7f5a80..573e0a4 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/StringTransformActionTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/StringTransformActionTest.java
@@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static com.google.code.beanmatchers.BeanMatchers.*;
 import static org.junit.Assert.*;
 
 public class StringTransformActionTest {
@@ -11,4 +11,19 @@ public class StringTransformActionTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(StringTransformAction.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void checkEquals() {
+		assertThat(StringTransformAction.class, hasValidBeanEquals());
+	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(StringTransformAction.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(StringTransformAction.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TopoSearchActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TopoSearchActionTest.java
index f7dc312..23efb05 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TopoSearchActionTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TopoSearchActionTest.java
@@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static com.google.code.beanmatchers.BeanMatchers.*;
 import static org.junit.Assert.*;
 
 public class TopoSearchActionTest {
@@ -11,4 +11,21 @@ public class TopoSearchActionTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(TopoSearchAction.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void checkEquals() {
+		assertThat(TopoSearchAction.class, hasValidBeanEquals());
+	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(TopoSearchAction.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(TopoSearchAction.class, hasValidBeanHashCodeFor());
+	}
+
+
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TranslateRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TranslateRequestTest.java
index 2a4b2b7..30cda9e 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TranslateRequestTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TranslateRequestTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class TranslateRequestTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(TranslateRequest.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(TranslateRequest.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(TranslateRequest.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/UnaryFieldActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/UnaryFieldActionTest.java
index de827f9..2ead066 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/UnaryFieldActionTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/UnaryFieldActionTest.java
@@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
 
 import org.junit.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static com.google.code.beanmatchers.BeanMatchers.*;
 import static org.junit.Assert.*;
 
 public class UnaryFieldActionTest {
@@ -11,4 +11,19 @@ public class UnaryFieldActionTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(UnaryFieldAction.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void checkEquals() {
+		assertThat(UnaryFieldAction.class, hasValidBeanEquals());
+	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(UnaryFieldAction.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(UnaryFieldAction.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ArtifactTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ArtifactTest.java
index 19b5abb..aca4838 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ArtifactTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ArtifactTest.java
@@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.restmodels.sdc;
 
 import org.junit.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static com.google.code.beanmatchers.BeanMatchers.*;
 import static org.junit.Assert.*;
 
 public class ArtifactTest {
@@ -11,4 +11,13 @@ public class ArtifactTest {
 		assertThat(Artifact.class, hasValidGettersAndSetters());
 	}
 
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Artifact.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Artifact.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DataTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DataTest.java
index 8c3ab0f..7e68de0 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DataTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DataTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.sdc;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class DataTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Data.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Data.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Data.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DcaeComponentsTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DcaeComponentsTest.java
index 7718f82..6487d81 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DcaeComponentsTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DcaeComponentsTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.sdc;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -13,4 +15,13 @@ public class DcaeComponentsTest {
 		assertThat(DcaeComponents.class, hasValidGettersAndSetters());
 	}
 
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(DcaeComponents.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(DcaeComponents.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ElementTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ElementTest.java
index 73def57..d35c189 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ElementTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ElementTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.sdc;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -12,4 +14,13 @@ public class ElementTest {
 		assertThat(Element.class, hasValidGettersAndSetters());
 	}
 
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Element.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Element.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ItemTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ItemTest.java
index 905a438..87ea18f 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ItemTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ItemTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.sdc;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ItemTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Item.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Item.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Item.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ModelTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ModelTest.java
index 7c470b5..f443dbf 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ModelTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ModelTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.sdc;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ModelTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Model.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Model.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Model.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceDetailedTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceDetailedTest.java
index bb5719d..854c4d0 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceDetailedTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceDetailedTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.sdc;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ResourceDetailedTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(ResourceDetailed.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(ResourceDetailed.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(ResourceDetailed.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceInstanceTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceInstanceTest.java
index 0f702c9..516debe 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceInstanceTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceInstanceTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.sdc;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ResourceInstanceTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(ResourceInstance.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(ResourceInstance.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(ResourceInstance.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceTest.java
index 8a66ac9..ddcd6cb 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.sdc;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ResourceTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Resource.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Resource.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Resource.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceDetailedTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceDetailedTest.java
index ec646c1..4b2a0e9 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceDetailedTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceDetailedTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.sdc;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ServiceDetailedTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(ServiceDetailed.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(ServiceDetailed.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(ServiceDetailed.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceTest.java
index c37919b..b68d46d 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.restmodels.sdc;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ServiceTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Service.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Service.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Service.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/services/ArtifactTest.java b/src/test/java/org/onap/sdc/dcae/composition/services/ArtifactTest.java
index 0af27a5..8431043 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/services/ArtifactTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/services/ArtifactTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.services;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ArtifactTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Artifact.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Artifact.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Artifact.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/services/ModelTest.java b/src/test/java/org/onap/sdc/dcae/composition/services/ModelTest.java
index 14ac7a8..0018ab1 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/services/ModelTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/services/ModelTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.services;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ModelTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Model.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Model.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Model.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/services/ResourceTest.java b/src/test/java/org/onap/sdc/dcae/composition/services/ResourceTest.java
index e1415f4..7fb24c2 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/services/ResourceTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/services/ResourceTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.services;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ResourceTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Resource.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Resource.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Resource.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/services/ServiceTest.java b/src/test/java/org/onap/sdc/dcae/composition/services/ServiceTest.java
index c633743..d90f288 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/services/ServiceTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/services/ServiceTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.services;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ServiceTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Service.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Service.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Service.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/services/ThinServiceTest.java b/src/test/java/org/onap/sdc/dcae/composition/services/ThinServiceTest.java
index 7c3d06e..580623d 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/services/ThinServiceTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/services/ThinServiceTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.services;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class ThinServiceTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(ThinService.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(ThinService.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(ThinService.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/vfcmt/VfcmtTest.java b/src/test/java/org/onap/sdc/dcae/composition/vfcmt/VfcmtTest.java
index 589fd64..6bc8b6f 100644
--- a/src/test/java/org/onap/sdc/dcae/composition/vfcmt/VfcmtTest.java
+++ b/src/test/java/org/onap/sdc/dcae/composition/vfcmt/VfcmtTest.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.composition.vfcmt;
 
 import org.junit.Test;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
 import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.*;
 
@@ -11,4 +13,14 @@ public class VfcmtTest {
 	public void shouldHaveValidGettersAndSetters() {
 		assertThat(Vfcmt.class, hasValidGettersAndSetters());
 	}
+
+	@Test
+	public void testHasValidConstructor() {
+		assertThat(Vfcmt.class, hasValidBeanConstructor());
+	}
+
+	@Test
+	public void checkHashCodeFor() {
+		assertThat(Vfcmt.class, hasValidBeanHashCodeFor());
+	}
 }
\ No newline at end of file