diff --git a/graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/GraphQLExecutorTests.java b/graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/GraphQLExecutorTests.java
index 2266e32f2..642a37c51 100644
--- a/graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/GraphQLExecutorTests.java
+++ b/graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/GraphQLExecutorTests.java
@@ -362,7 +362,7 @@ public void queryForEntityWithMappedSuperclass() {
 
     // https://github.com/introproventures/graphql-jpa-query/issues/30
     @Test
-    public void queryForEntityWithEmeddableType() {
+    public void queryForEntityWithEmbeddedIdAndEmbeddedField() {
         //given
         String query = "{ Boat(boatId: {id: \"1\" country: \"EN\"}) { boatId {id country} engine { identification } } }";
         
@@ -376,7 +376,7 @@ public void queryForEntityWithEmeddableType() {
     }
 
     @Test
-    public void queryForEntityWithEmeddableTypeAndWhere() {
+    public void queryForEntityWithEmbeddedFieldWithWhere() {
         //given
         String query = "{ Boats { select { boatId {id country} engine(where: { identification: { EQ: \"12345\"}}) { identification } } } }";
 
@@ -390,9 +390,9 @@ public void queryForEntityWithEmeddableTypeAndWhere() {
     }
 
     @Test
-    public void queryForEntitiesWithEmeddableTypeAndWhereEmbeddableId() {
+    public void queryForEntitiesWithWithEmbeddedIdWithWhere() {
         //given
-        String query = "{ Boats(where: {boatId: {EQ: {id: \"1\" country: \"EN\"}}}) { select { boatId {id country} engine { identification } } } }";
+        String query = "{ Boats { select { boatId(where: { id: { LIKE: \"1\"} country: { EQ: \"EN\"}}) {id country} engine { identification } } } }";
 
         String expected = "{Boats={select=[{boatId={id=1, country=EN}, engine={identification=12345}}]}}";
 
@@ -402,5 +402,5 @@ public void queryForEntitiesWithEmeddableTypeAndWhereEmbeddableId() {
         // then
         assertThat(result.toString()).isEqualTo(expected);
     }
-    
+
 }
\ No newline at end of file