diff --git a/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_31_GCC_O0_EmulatorTest.java b/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_31_GCC_O0_EmulatorTest.java
index 84b8b46890..71aaf11790 100644
--- a/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_31_GCC_O0_EmulatorTest.java
+++ b/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_31_GCC_O0_EmulatorTest.java
@@ -37,15 +37,16 @@ public class AVR8_31_GCC_O0_EmulatorTest extends ProcessorEmulatorTestAdapter {
 		return "AVR8_31_GCC_O0";
 	}
 
-	protected void initializeState(EmulatorTestRunner testRunner, Program program) throws Exception {
+	@Override
+	protected void initializeState(EmulatorTestRunner testRunner, Program program)
+			throws Exception {
 		// These eliminate "uninitialized register" errors. Not strictly needed, but helps find actual problems.
 		testRunner.setRegister("SP", 0x0);
 		testRunner.setRegister("R1", 0x0);
 		testRunner.setRegister("Y", 0x0);
-		testRunner.setRegister("W", 0x0);		
-		testRunner.setRegister("SREG", 0x0);
+		testRunner.setRegister("W", 0x0);
 	}
-	
+
 	@Override
 	protected void setAnalysisOptions(Options analysisOptions) {
 		super.setAnalysisOptions(analysisOptions);
@@ -54,6 +55,7 @@ public class AVR8_31_GCC_O0_EmulatorTest extends ProcessorEmulatorTestAdapter {
 	}
 
 	public static Test suite() {
-		return ProcessorEmulatorTestAdapter.buildEmulatorTestSuite(AVR8_31_GCC_O0_EmulatorTest.class);
+		return ProcessorEmulatorTestAdapter.buildEmulatorTestSuite(
+			AVR8_31_GCC_O0_EmulatorTest.class);
 	}
 }
diff --git a/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_31_GCC_O3_EmulatorTest.java b/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_31_GCC_O3_EmulatorTest.java
index b47f4efcf5..499e88c039 100644
--- a/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_31_GCC_O3_EmulatorTest.java
+++ b/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_31_GCC_O3_EmulatorTest.java
@@ -37,15 +37,16 @@ public class AVR8_31_GCC_O3_EmulatorTest extends ProcessorEmulatorTestAdapter {
 		return "AVR8_31_GCC_O3";
 	}
 
-	protected void initializeState(EmulatorTestRunner testRunner, Program program) throws Exception {
+	@Override
+	protected void initializeState(EmulatorTestRunner testRunner, Program program)
+			throws Exception {
 		// These eliminate "uninitialized register" errors. Not strictly needed, but helps find actual problems.
 		testRunner.setRegister("SP", 0x0);
 		testRunner.setRegister("R1", 0x0);
 		testRunner.setRegister("Y", 0x0);
-		testRunner.setRegister("W", 0x0);		
-		testRunner.setRegister("SREG", 0x0);
+		testRunner.setRegister("W", 0x0);
 	}
-	
+
 	@Override
 	protected void setAnalysisOptions(Options analysisOptions) {
 		super.setAnalysisOptions(analysisOptions);
@@ -54,6 +55,7 @@ public class AVR8_31_GCC_O3_EmulatorTest extends ProcessorEmulatorTestAdapter {
 	}
 
 	public static Test suite() {
-		return ProcessorEmulatorTestAdapter.buildEmulatorTestSuite(AVR8_31_GCC_O3_EmulatorTest.class);
+		return ProcessorEmulatorTestAdapter.buildEmulatorTestSuite(
+			AVR8_31_GCC_O3_EmulatorTest.class);
 	}
 }
diff --git a/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_51_GCC_O0_EmulatorTest.java b/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_51_GCC_O0_EmulatorTest.java
index baa871efa8..1b98b6c8ae 100644
--- a/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_51_GCC_O0_EmulatorTest.java
+++ b/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_51_GCC_O0_EmulatorTest.java
@@ -37,15 +37,16 @@ public class AVR8_51_GCC_O0_EmulatorTest extends ProcessorEmulatorTestAdapter {
 		return "AVR8_51_GCC_O0";
 	}
 
-	protected void initializeState(EmulatorTestRunner testRunner, Program program) throws Exception {
+	@Override
+	protected void initializeState(EmulatorTestRunner testRunner, Program program)
+			throws Exception {
 		// These eliminate "uninitialized register" errors. Not strictly needed, but helps find actual problems.
 		testRunner.setRegister("SP", 0x0);
 		testRunner.setRegister("R1", 0x0);
 		testRunner.setRegister("Y", 0x0);
-		testRunner.setRegister("W", 0x0);		
-		testRunner.setRegister("SREG", 0x0);
+		testRunner.setRegister("W", 0x0);
 	}
-	
+
 	@Override
 	protected void setAnalysisOptions(Options analysisOptions) {
 		super.setAnalysisOptions(analysisOptions);
@@ -54,6 +55,7 @@ public class AVR8_51_GCC_O0_EmulatorTest extends ProcessorEmulatorTestAdapter {
 	}
 
 	public static Test suite() {
-		return ProcessorEmulatorTestAdapter.buildEmulatorTestSuite(AVR8_51_GCC_O0_EmulatorTest.class);
+		return ProcessorEmulatorTestAdapter.buildEmulatorTestSuite(
+			AVR8_51_GCC_O0_EmulatorTest.class);
 	}
 }
diff --git a/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_51_GCC_O3_EmulatorTest.java b/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_51_GCC_O3_EmulatorTest.java
index 68618ed63d..33b3907a57 100644
--- a/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_51_GCC_O3_EmulatorTest.java
+++ b/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_51_GCC_O3_EmulatorTest.java
@@ -37,15 +37,16 @@ public class AVR8_51_GCC_O3_EmulatorTest extends ProcessorEmulatorTestAdapter {
 		return "AVR8_51_GCC_O3";
 	}
 
-	protected void initializeState(EmulatorTestRunner testRunner, Program program) throws Exception {
+	@Override
+	protected void initializeState(EmulatorTestRunner testRunner, Program program)
+			throws Exception {
 		// These eliminate "uninitialized register" errors. Not strictly needed, but helps find actual problems.
 		testRunner.setRegister("SP", 0x0);
 		testRunner.setRegister("R1", 0x0);
 		testRunner.setRegister("Y", 0x0);
-		testRunner.setRegister("W", 0x0);		
-		testRunner.setRegister("SREG", 0x0);
+		testRunner.setRegister("W", 0x0);
 	}
-	
+
 	@Override
 	protected void setAnalysisOptions(Options analysisOptions) {
 		super.setAnalysisOptions(analysisOptions);
@@ -54,6 +55,7 @@ public class AVR8_51_GCC_O3_EmulatorTest extends ProcessorEmulatorTestAdapter {
 	}
 
 	public static Test suite() {
-		return ProcessorEmulatorTestAdapter.buildEmulatorTestSuite(AVR8_51_GCC_O3_EmulatorTest.class);
+		return ProcessorEmulatorTestAdapter.buildEmulatorTestSuite(
+			AVR8_51_GCC_O3_EmulatorTest.class);
 	}
 }
diff --git a/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_6_GCC_O0_EmulatorTest.java b/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_6_GCC_O0_EmulatorTest.java
index 06b348a6a0..9163c42ea4 100644
--- a/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_6_GCC_O0_EmulatorTest.java
+++ b/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_6_GCC_O0_EmulatorTest.java
@@ -37,15 +37,16 @@ public class AVR8_6_GCC_O0_EmulatorTest extends ProcessorEmulatorTestAdapter {
 		return "AVR8_6_GCC_O0";
 	}
 
-	protected void initializeState(EmulatorTestRunner testRunner, Program program) throws Exception {
+	@Override
+	protected void initializeState(EmulatorTestRunner testRunner, Program program)
+			throws Exception {
 		// These eliminate "uninitialized register" errors. Not strictly needed, but helps find actual problems.
 		testRunner.setRegister("SP", 0x0);
 		testRunner.setRegister("R1", 0x0);
 		testRunner.setRegister("Y", 0x0);
-		testRunner.setRegister("W", 0x0);		
-		testRunner.setRegister("SREG", 0x0);
+		testRunner.setRegister("W", 0x0);
 	}
-	
+
 	@Override
 	protected void setAnalysisOptions(Options analysisOptions) {
 		super.setAnalysisOptions(analysisOptions);
@@ -54,6 +55,7 @@ public class AVR8_6_GCC_O0_EmulatorTest extends ProcessorEmulatorTestAdapter {
 	}
 
 	public static Test suite() {
-		return ProcessorEmulatorTestAdapter.buildEmulatorTestSuite(AVR8_6_GCC_O0_EmulatorTest.class);
+		return ProcessorEmulatorTestAdapter.buildEmulatorTestSuite(
+			AVR8_6_GCC_O0_EmulatorTest.class);
 	}
 }
diff --git a/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_6_GCC_O3_EmulatorTest.java b/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_6_GCC_O3_EmulatorTest.java
index cf648b1c99..e346813cbd 100644
--- a/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_6_GCC_O3_EmulatorTest.java
+++ b/Ghidra/Processors/Atmel/src/test.processors/java/ghidra/test/processors/AVR8_6_GCC_O3_EmulatorTest.java
@@ -37,15 +37,16 @@ public class AVR8_6_GCC_O3_EmulatorTest extends ProcessorEmulatorTestAdapter {
 		return "AVR8_6_GCC_O3";
 	}
 
-	protected void initializeState(EmulatorTestRunner testRunner, Program program) throws Exception {
+	@Override
+	protected void initializeState(EmulatorTestRunner testRunner, Program program)
+			throws Exception {
 		// These eliminate "uninitialized register" errors. Not strictly needed, but helps find actual problems.
 		testRunner.setRegister("SP", 0x0);
 		testRunner.setRegister("R1", 0x0);
 		testRunner.setRegister("Y", 0x0);
-		testRunner.setRegister("W", 0x0);		
-		testRunner.setRegister("SREG", 0x0);
+		testRunner.setRegister("W", 0x0);
 	}
-	
+
 	@Override
 	protected void setAnalysisOptions(Options analysisOptions) {
 		super.setAnalysisOptions(analysisOptions);
@@ -54,6 +55,7 @@ public class AVR8_6_GCC_O3_EmulatorTest extends ProcessorEmulatorTestAdapter {
 	}
 
 	public static Test suite() {
-		return ProcessorEmulatorTestAdapter.buildEmulatorTestSuite(AVR8_6_GCC_O3_EmulatorTest.class);
+		return ProcessorEmulatorTestAdapter.buildEmulatorTestSuite(
+			AVR8_6_GCC_O3_EmulatorTest.class);
 	}
 }