diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/BlackWidow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/BlackWidow.java
index d7561f3e9..5b50d74b5 100644
--- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/BlackWidow.java
+++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/BlackWidow.java
@@ -1 +1,20 @@
-/*
 * Copyright 2010, Red Hat, Inc., and individual contributors
 * by the @authors tag. See the copyright.txt in the distribution for a
 * full listing of individual contributors.
 *
 * Licensed 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.jboss.cdi.tck.tests.implementation.producer.method.definition;

class BlackWidow extends Spider implements DeadlySpider {

}
\ No newline at end of file
+/*
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.cdi.tck.tests.implementation.producer.method.definition;
+
+class BlackWidow extends Spider implements DeadlySpider {
+
+}
diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/DependentSelfConsumingNormalProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/DependentSelfConsumingNormalProducer.java
index c88a801ce..8e641b824 100644
--- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/DependentSelfConsumingNormalProducer.java
+++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/DependentSelfConsumingNormalProducer.java
@@ -1 +1,39 @@
-/*
 * Copyright 2010, Red Hat, Inc., and individual contributors
 * by the @authors tag. See the copyright.txt in the distribution for a
 * full listing of individual contributors.
 *
 * Licensed 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.jboss.cdi.tck.tests.lookup.circular;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.Dependent;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;

@Dependent
public class DependentSelfConsumingNormalProducer {
    @Inject
    @SelfConsumingNormal1
    Violation violation;

    @Produces
    @ApplicationScoped
    @SelfConsumingNormal1
    public Violation produceViolation() {
        return new Violation(DependentSelfConsumingNormalProducer.class.getName());
    }

    public void ping() {
        violation.ping();
    }
}
\ No newline at end of file
+/*
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.cdi.tck.tests.lookup.circular;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+
+@Dependent
+public class DependentSelfConsumingNormalProducer {
+    @Inject
+    @SelfConsumingNormal1
+    Violation violation;
+
+    @Produces
+    @ApplicationScoped
+    @SelfConsumingNormal1
+    public Violation produceViolation() {
+        return new Violation(DependentSelfConsumingNormalProducer.class.getName());
+    }
+
+    public void ping() {
+        violation.ping();
+    }
+}
\ No newline at end of file
diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/NormalSelfConsumingNormalProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/NormalSelfConsumingNormalProducer.java
index c876aff46..a6da6caa9 100644
--- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/NormalSelfConsumingNormalProducer.java
+++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/NormalSelfConsumingNormalProducer.java
@@ -1 +1,38 @@
-/*
 * Copyright 2010, Red Hat, Inc., and individual contributors
 * by the @authors tag. See the copyright.txt in the distribution for a
 * full listing of individual contributors.
 *
 * Licensed 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.jboss.cdi.tck.tests.lookup.circular;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;

@ApplicationScoped
public class NormalSelfConsumingNormalProducer {
    @Inject
    @SelfConsumingNormal
    Violation violation;

    @Produces
    @ApplicationScoped
    @SelfConsumingNormal
    public Violation produceViolation() {
        return new Violation(NormalSelfConsumingNormalProducer.class.getName());
    }

    public void ping() {
        violation.ping();
    }
}
\ No newline at end of file
+/*
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.cdi.tck.tests.lookup.circular;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+
+@ApplicationScoped
+public class NormalSelfConsumingNormalProducer {
+    @Inject
+    @SelfConsumingNormal
+    Violation violation;
+
+    @Produces
+    @ApplicationScoped
+    @SelfConsumingNormal
+    public Violation produceViolation() {
+        return new Violation(NormalSelfConsumingNormalProducer.class.getName());
+    }
+
+    public void ping() {
+        violation.ping();
+    }
+}
\ No newline at end of file