diff --git a/src/main/java/de/kosit/validationtool/api/InputFactory.java b/src/main/java/de/kosit/validationtool/api/InputFactory.java
index 718cc8e..dfb7bb5 100644
--- a/src/main/java/de/kosit/validationtool/api/InputFactory.java
+++ b/src/main/java/de/kosit/validationtool/api/InputFactory.java
@@ -46,6 +46,7 @@ import static org.apache.commons.lang3.StringUtils.isNotEmpty;
  *
  * @author Andreas Penski
  */
+@Getter
 @Slf4j
 public class InputFactory {
 
@@ -58,7 +59,6 @@ public class InputFactory {
 
     private static final String MESSAGE_OPEN_STREAM_ERROR = "Can not open stream from";
 
-    @Getter
     private final String algorithm;
 
     InputFactory() {
diff --git a/src/main/java/de/kosit/validationtool/impl/ContentRepository.java b/src/main/java/de/kosit/validationtool/impl/ContentRepository.java
index 0ea68da..6b9d963 100644
--- a/src/main/java/de/kosit/validationtool/impl/ContentRepository.java
+++ b/src/main/java/de/kosit/validationtool/impl/ContentRepository.java
@@ -68,8 +68,14 @@ public class ContentRepository {
 
     private final URI repository;
 
+    /**
+     * -- GETTER -- Returns the to use for resolving xml artifacts.
+     *
+     */
+    @Getter
     private final URIResolver resolver;
 
+    @Getter
     private final UnparsedTextURIResolver unparsedTextURIResolver;
 
     private final SchemaFactory schemaFactory;
@@ -216,19 +222,6 @@ public class ContentRepository {
         }
     }
 
-    /**
-     * Returns the {@link URIResolver} to use for resolving xml artifacts.
-     *
-     * @return the resolver
-     */
-    public URIResolver getResolver() {
-        return this.resolver;
-    }
-
-    public UnparsedTextURIResolver getUnparsedTextURIResolver() {
-        return this.unparsedTextURIResolver;
-    }
-
     /**
      * Gibt eine Transformation zurück.
      *
diff --git a/src/main/java/de/kosit/validationtool/impl/DefaultCheck.java b/src/main/java/de/kosit/validationtool/impl/DefaultCheck.java
index e134874..2efdc7d 100644
--- a/src/main/java/de/kosit/validationtool/impl/DefaultCheck.java
+++ b/src/main/java/de/kosit/validationtool/impl/DefaultCheck.java
@@ -55,19 +55,16 @@ import static de.kosit.validationtool.impl.DateFactory.createTimestamp;
  *
  * @author Andreas Penski
  */
+@Getter
 @Slf4j
 public class DefaultCheck implements Check {
 
-    @Getter
     private final ConversionService conversionService;
 
-    @Getter
     private final List<Configuration> configuration;
 
-    @Getter
     private final List<CheckAction> checkSteps;
 
-    @Getter
     private final Processor processor;
 
     public DefaultCheck(final Configuration... configuration) {
diff --git a/src/main/java/de/kosit/validationtool/impl/ResolvingMode.java b/src/main/java/de/kosit/validationtool/impl/ResolvingMode.java
index 3164954..1482bc7 100644
--- a/src/main/java/de/kosit/validationtool/impl/ResolvingMode.java
+++ b/src/main/java/de/kosit/validationtool/impl/ResolvingMode.java
@@ -28,6 +28,7 @@ import lombok.RequiredArgsConstructor;
  *
  * @author Andreas Penski
  */
+@Getter
 @RequiredArgsConstructor
 public enum ResolvingMode {
 
@@ -46,7 +47,6 @@ public enum ResolvingMode {
     @SuppressWarnings("unused")
     CUSTOM(null);
 
-    @Getter
     private final ResolvingConfigurationStrategy strategy;
 
 }
diff --git a/src/test/java/de/kosit/validationtool/cmd/CommandLine.java b/src/test/java/de/kosit/validationtool/cmd/CommandLine.java
index b90abd6..2461205 100644
--- a/src/test/java/de/kosit/validationtool/cmd/CommandLine.java
+++ b/src/test/java/de/kosit/validationtool/cmd/CommandLine.java
@@ -43,10 +43,10 @@ public class CommandLine {
      *
      * @param <O> Typ des eigentlichen {@link OutputStream}
      */
+    @Setter
+    @Getter
     private static class ReplaceableOutputStream<O extends OutputStream> extends OutputStream {
 
-        @Getter
-        @Setter
         private O out;
 
         @Override