diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/FeedCallback.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/FeedCallback.java
index a8a9478..6433d0f 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/FeedCallback.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/FeedCallback.java
@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ******************************************************************************/
 package org.apache.olingo.odata2.core.ep.consumer;
 
 import java.util.HashMap;
diff --git a/odata2-lib/odata-core/src/test/resources/Employee_InlineRoomBuilding.xml b/odata2-lib/odata-core/src/test/resources/Employee_InlineRoomBuilding.xml
index 37ca6e8..a465b86 100644
--- a/odata2-lib/odata-core/src/test/resources/Employee_InlineRoomBuilding.xml
+++ b/odata2-lib/odata-core/src/test/resources/Employee_InlineRoomBuilding.xml
@@ -1,4 +1,22 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
 <entry xmlns="http://www.w3.org/2005/Atom" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xml:base="http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/">
 	<id>http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Employees('1')</id>
 	<title type="text">Walter Winter</title>
diff --git a/odata2-lib/odata-core/src/test/resources/Room_EmptyInlineEmployeesToTeam.xml b/odata2-lib/odata-core/src/test/resources/Room_EmptyInlineEmployeesToTeam.xml
index 6ec35fe..8cdbbac 100644
--- a/odata2-lib/odata-core/src/test/resources/Room_EmptyInlineEmployeesToTeam.xml
+++ b/odata2-lib/odata-core/src/test/resources/Room_EmptyInlineEmployeesToTeam.xml
@@ -1,4 +1,22 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
 <entry xmlns="http://www.w3.org/2005/Atom" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xml:base="http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/" m:etag="W/&quot;1&quot;">
     <id>http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Rooms('10')</id>
     <title type="text">Room 10</title>
diff --git a/odata2-lib/odata-core/src/test/resources/Room_InlineEmployeesToTeam.xml b/odata2-lib/odata-core/src/test/resources/Room_InlineEmployeesToTeam.xml
index 95fd709..524295b 100644
--- a/odata2-lib/odata-core/src/test/resources/Room_InlineEmployeesToTeam.xml
+++ b/odata2-lib/odata-core/src/test/resources/Room_InlineEmployeesToTeam.xml
@@ -1,4 +1,22 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
 <entry xmlns="http://www.w3.org/2005/Atom" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xml:base="http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/" m:etag="W/&quot;1&quot;">
 	<id>http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Rooms('1')</id>
 	<title type="text">Room 1</title>
diff --git a/odata2-lib/odata-core/src/test/resources/RoomsToEmployeesWithInlineTeams.xml b/odata2-lib/odata-core/src/test/resources/RoomsToEmployeesWithInlineTeams.xml
index 898ce9e..2cc286d 100644
--- a/odata2-lib/odata-core/src/test/resources/RoomsToEmployeesWithInlineTeams.xml
+++ b/odata2-lib/odata-core/src/test/resources/RoomsToEmployeesWithInlineTeams.xml
@@ -1,4 +1,22 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
 <feed xmlns="http://www.w3.org/2005/Atom" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/">
 	<id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees</id>
 	<title type="text">Employees</title>
diff --git a/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployeesTeams.xml b/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployeesTeams.xml
index 5197d6d..ce20466 100644
--- a/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployeesTeams.xml
+++ b/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployeesTeams.xml
@@ -1,4 +1,22 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
 <feed xmlns="http://www.w3.org/2005/Atom" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/">
 	<id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Rooms</id>
 	<title type="text">Rooms</title>
diff --git a/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployees_InlineBuildings.xml b/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployees_InlineBuildings.xml
index 7fd635a..6f30b61 100644
--- a/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployees_InlineBuildings.xml
+++ b/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployees_InlineBuildings.xml
@@ -1,4 +1,22 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
 <feed xmlns="http://www.w3.org/2005/Atom" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/">
 	<id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Rooms</id>
 	<title type="text">Rooms</title>