diff --git a/pom.xml b/pom.xml
index d5db706..24b337f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,14 +13,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
         <netbeans.version>RELEASE721</netbeans.version>
-        <netbeans.run.params.ide />
-        <netbeans.run.params>${netbeans.run.params.ide}</netbeans.run.params>
     </properties>
     <organization>
         <name>Benno Markiewicz (benno.markiewicz@googlemail.com)</name>
     </organization>
     <url>https://github.com/markiewb/nb-additional-hints</url>
-    
+
     <repositories>
         <!--
         Repository hosting NetBeans modules, especially APIs.
@@ -120,7 +118,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>nbm-maven-plugin</artifactId>
-                <version>3.11</version>
+                <version>3.11.1</version>
                 <extensions>true</extensions>
                 <configuration>
                     <!-- keep this id, else the update from existing versions will fail
diff --git a/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePackageProtected.java b/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePackageProtected.java
new file mode 100644
index 0000000..8f8c788
--- /dev/null
+++ b/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePackageProtected.java
@@ -0,0 +1,95 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ * 
+ * "Portions Copyrighted 2013 Benno Markiewicz"
+ */
+package de.markiewb.netbeans.plugins.hints.modifiers;
+
+import com.sun.source.tree.ModifiersTree;
+import com.sun.source.tree.Tree;
+import com.sun.source.util.TreePath;
+import java.util.EnumSet;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
+import org.netbeans.spi.editor.hints.ErrorDescription;
+import org.netbeans.spi.editor.hints.Fix;
+import org.netbeans.spi.editor.hints.Severity;
+import org.netbeans.spi.java.hints.ErrorDescriptionFactory;
+import org.netbeans.spi.java.hints.Hint;
+import org.netbeans.spi.java.hints.HintContext;
+import org.netbeans.spi.java.hints.TriggerTreeKind;
+import org.netbeans.spi.java.hints.support.FixFactory;
+import org.openide.util.NbBundle;
+
+/**
+ * Turns a class, method of field public.
+ */
+@NbBundle.Messages({
+    "ERR_MakePackageProtected=Make Package Protected",
+    "DN_MakePackageProtected=Make Package Protected",
+    "DESC_MakePackageProtected=Makes a class, method or field package protected."})
+public class MakePackageProtected {
+
+    private static final EnumSet<Modifier> opositeModifiers = EnumSet.of(Modifier.PRIVATE, Modifier.PUBLIC, Modifier.PROTECTED);
+
+    @Hint(displayName = "#DN_MakePackageProtected", description = "#DESC_MakePackageProtected", category = "suggestions",
+            hintKind = Hint.Kind.INSPECTION, severity = Severity.HINT)
+    @TriggerTreeKind({Tree.Kind.CLASS, Tree.Kind.METHOD, Tree.Kind.VARIABLE})
+    public static ErrorDescription convert(HintContext ctx) {
+
+        TreePath path = ctx.getPath();
+        Element element = ctx.getInfo().getTrees().getElement(path);
+
+        if (element == null) {
+            return null;
+        }
+
+        ModifiersTree modifiers = ModifierUtils.getModifiersTree(path, element);
+
+        if (modifiers == null || (!modifiers.getFlags().contains(Modifier.PROTECTED)
+                && !modifiers.getFlags().contains(Modifier.PRIVATE)
+                && !modifiers.getFlags().contains(Modifier.PUBLIC))) {
+            return null;
+        }
+
+        Fix fix = FixFactory.changeModifiersFix(ctx.getInfo(), new TreePath(path, modifiers), EnumSet.of(Modifier.PROTECTED), opositeModifiers, Bundle.ERR_MakePackageProtected());
+        return ErrorDescriptionFactory.forName(ctx, path, Bundle.ERR_MakePackageProtected(), fix);
+    }
+}
diff --git a/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePrivate.java b/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePrivate.java
new file mode 100644
index 0000000..276e7e0
--- /dev/null
+++ b/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePrivate.java
@@ -0,0 +1,94 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ * 
+ * "Portions Copyrighted 2013 Benno Markiewicz"
+ */
+package de.markiewb.netbeans.plugins.hints.modifiers;
+
+import com.sun.source.tree.ModifiersTree;
+import com.sun.source.tree.Tree;
+import com.sun.source.util.TreePath;
+import java.util.EnumSet;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
+import org.netbeans.spi.editor.hints.ErrorDescription;
+import org.netbeans.spi.editor.hints.Fix;
+import org.netbeans.spi.editor.hints.Severity;
+import org.netbeans.spi.java.hints.ErrorDescriptionFactory;
+import org.netbeans.spi.java.hints.Hint;
+import org.netbeans.spi.java.hints.HintContext;
+import org.netbeans.spi.java.hints.TriggerTreeKind;
+import org.netbeans.spi.java.hints.support.FixFactory;
+import org.openide.util.NbBundle;
+
+@NbBundle.Messages({
+    "ERR_MakePrivate=Make Private",
+    "DN_MakePrivate=Make Private",
+    "DESC_MakePrivate=Makes a class, method or field private."})
+public class MakePrivate {
+
+    private static final EnumSet<Modifier> opositeModifiers = EnumSet.of(Modifier.PUBLIC, Modifier.PROTECTED);
+
+    @Hint(displayName = "#DN_MakePrivate", description = "#DESC_MakePrivate", category = "suggestions",
+            hintKind = Hint.Kind.INSPECTION, severity = Severity.HINT)
+    @TriggerTreeKind({Tree.Kind.CLASS, Tree.Kind.METHOD, Tree.Kind.VARIABLE})
+    public static ErrorDescription convert(HintContext ctx) {
+
+        TreePath path = ctx.getPath();
+        Element element = ctx.getInfo().getTrees().getElement(path);
+
+        if (element == null) {
+            return null;
+        }
+
+        if (ModifierUtils.isTopLevelClass(element)) {
+            return null;
+        }
+
+        ModifiersTree modifiers = ModifierUtils.getModifiersTree(path, element);
+
+        if (modifiers == null || modifiers.getFlags().contains(Modifier.PRIVATE)) {
+            return null;
+        }
+
+        Fix fix = FixFactory.changeModifiersFix(ctx.getInfo(), new TreePath(path, modifiers), EnumSet.of(Modifier.PRIVATE), opositeModifiers, Bundle.ERR_MakePrivate());
+        return ErrorDescriptionFactory.forName(ctx, path, Bundle.ERR_MakePrivate(), fix);
+    }
+}
diff --git a/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/MakeProtected.java b/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/MakeProtected.java
new file mode 100644
index 0000000..0e4cbc1
--- /dev/null
+++ b/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/MakeProtected.java
@@ -0,0 +1,97 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ * 
+ * "Portions Copyrighted 2013 Benno Markiewicz"
+ */
+package de.markiewb.netbeans.plugins.hints.modifiers;
+
+import com.sun.source.tree.ModifiersTree;
+import com.sun.source.tree.Tree;
+import com.sun.source.util.TreePath;
+import java.util.EnumSet;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
+import org.netbeans.spi.editor.hints.ErrorDescription;
+import org.netbeans.spi.editor.hints.Fix;
+import org.netbeans.spi.editor.hints.Severity;
+import org.netbeans.spi.java.hints.ErrorDescriptionFactory;
+import org.netbeans.spi.java.hints.Hint;
+import org.netbeans.spi.java.hints.HintContext;
+import org.netbeans.spi.java.hints.TriggerTreeKind;
+import org.netbeans.spi.java.hints.support.FixFactory;
+import org.openide.util.NbBundle;
+
+/**
+ * Turns a class, method of field public.
+ */
+@NbBundle.Messages({
+    "ERR_MakeProtected=Make Protected",
+    "DN_MakeProtected=Make Protected",
+    "DESC_MakeProtected=Makes a class, method or field protected."})
+public class MakeProtected {
+
+    private static final EnumSet<Modifier> opositeModifiers = EnumSet.of(Modifier.PRIVATE, Modifier.PUBLIC);
+
+    @Hint(displayName = "#DN_MakeProtected", description = "#DESC_MakeProtected", category = "suggestions",
+            hintKind = Hint.Kind.INSPECTION, severity = Severity.HINT)
+    @TriggerTreeKind({Tree.Kind.CLASS, Tree.Kind.METHOD, Tree.Kind.VARIABLE})
+    public static ErrorDescription convert(HintContext ctx) {
+
+        TreePath path = ctx.getPath();
+        Element element = ctx.getInfo().getTrees().getElement(path);
+
+        if (element == null) {
+            return null;
+        }
+
+        if (ModifierUtils.isTopLevelClass(element)) {
+            return null;
+        }
+
+        ModifiersTree modifiers = ModifierUtils.getModifiersTree(path, element);
+
+        if (modifiers == null || modifiers.getFlags().contains(Modifier.PROTECTED)) {
+            return null;
+        }
+
+        Fix fix = FixFactory.changeModifiersFix(ctx.getInfo(), new TreePath(path, modifiers), EnumSet.of(Modifier.PROTECTED), opositeModifiers, Bundle.ERR_MakeProtected());
+        return ErrorDescriptionFactory.forName(ctx, path, Bundle.ERR_MakeProtected(), fix);
+    }
+}
diff --git a/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePublic.java b/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePublic.java
new file mode 100644
index 0000000..8bb57cb
--- /dev/null
+++ b/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePublic.java
@@ -0,0 +1,93 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ * 
+ * "Portions Copyrighted 2013 Benno Markiewicz"
+ */
+package de.markiewb.netbeans.plugins.hints.modifiers;
+
+import com.sun.source.tree.ModifiersTree;
+import com.sun.source.tree.Tree;
+import com.sun.source.util.TreePath;
+import java.util.EnumSet;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
+import org.netbeans.spi.editor.hints.ErrorDescription;
+import org.netbeans.spi.editor.hints.Fix;
+import org.netbeans.spi.editor.hints.Severity;
+import org.netbeans.spi.java.hints.ErrorDescriptionFactory;
+import org.netbeans.spi.java.hints.Hint;
+import org.netbeans.spi.java.hints.HintContext;
+import org.netbeans.spi.java.hints.TriggerTreeKind;
+import org.netbeans.spi.java.hints.support.FixFactory;
+import org.openide.util.NbBundle;
+
+/**
+ * Turns a class, method of field public.
+ */
+@NbBundle.Messages({
+    "ERR_MakePublic=Make Public",
+    "DN_MakePublic=Make Public",
+    "DESC_MakePublic=Makes a class, method or field public."})
+public class MakePublic {
+
+    private static final EnumSet<Modifier> opositeModifiers = EnumSet.of(Modifier.PRIVATE, Modifier.PROTECTED);
+
+    @Hint(displayName = "#DN_MakePublic", description = "#DESC_MakePublic", category = "suggestions",
+            hintKind = Hint.Kind.INSPECTION, severity = Severity.HINT)
+    @TriggerTreeKind({Tree.Kind.CLASS, Tree.Kind.METHOD, Tree.Kind.VARIABLE})
+    public static ErrorDescription convert(HintContext ctx) {
+
+        TreePath path = ctx.getPath();
+        Element element = ctx.getInfo().getTrees().getElement(path);
+
+        if (element == null) {
+            return null;
+        }
+
+        ModifiersTree modifiers = ModifierUtils.getModifiersTree(path, element);
+
+        if (modifiers == null || modifiers.getFlags().contains(Modifier.PUBLIC)) {
+            return null;
+        }
+
+        Fix fix = FixFactory.changeModifiersFix(ctx.getInfo(), new TreePath(path, modifiers), EnumSet.of(Modifier.PUBLIC), opositeModifiers, Bundle.ERR_MakePublic());
+        return ErrorDescriptionFactory.forName(ctx, path, Bundle.ERR_MakePublic(), fix);
+    }
+}
diff --git a/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/ModifierUtils.java b/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/ModifierUtils.java
new file mode 100644
index 0000000..66199fe
--- /dev/null
+++ b/src/main/java/de/markiewb/netbeans/plugins/hints/modifiers/ModifierUtils.java
@@ -0,0 +1,49 @@
+package de.markiewb.netbeans.plugins.hints.modifiers;
+
+import com.sun.source.tree.ClassTree;
+import com.sun.source.tree.MethodTree;
+import com.sun.source.tree.ModifiersTree;
+import com.sun.source.tree.Tree;
+import com.sun.source.tree.VariableTree;
+import com.sun.source.util.TreePath;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.NestingKind;
+import javax.lang.model.element.TypeElement;
+
+class ModifierUtils {
+
+    static boolean isTopLevelClass(Element element) {
+
+        if (element == null) {
+            return false;
+        }
+
+        if (element.getKind() == ElementKind.CLASS) {
+            TypeElement clazz = (TypeElement) element;
+            if (clazz.getNestingKind() == NestingKind.TOP_LEVEL) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    static ModifiersTree getModifiersTree(TreePath path, Element element) {
+        ModifiersTree modifiers = null;
+        Tree leaf = path.getLeaf();
+        switch (element.getKind()) {
+            case FIELD:
+                modifiers = ((VariableTree) leaf).getModifiers();
+                break;
+            case CLASS:
+                modifiers = ((ClassTree) leaf).getModifiers();
+                break;
+            case METHOD:
+                modifiers = ((MethodTree) leaf).getModifiers();
+                break;
+        }
+
+        return modifiers;
+    }
+}
diff --git a/src/test/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePackageProtectedTest.java b/src/test/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePackageProtectedTest.java
new file mode 100644
index 0000000..a735be1
--- /dev/null
+++ b/src/test/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePackageProtectedTest.java
@@ -0,0 +1,179 @@
+package de.markiewb.netbeans.plugins.hints.modifiers;
+
+import org.junit.Test;
+import org.netbeans.modules.java.hints.test.api.HintTest;
+
+public class MakePackageProtectedTest {
+
+    @Test
+    public void testFixWorking_Public_TopLevel_Class() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {}\n")
+                .run(MakePackageProtected.class)
+                .findWarning("1:13-1:17:hint:" + Bundle.ERR_MakePackageProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "class Test {}\n");
+    }
+
+    @Test
+    public void testFixWorking_Public_Method() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    public static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n")
+                .run(MakePackageProtected.class)
+                .findWarning("2:23-2:27:hint:" + Bundle.ERR_MakePackageProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Private_Method() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    private static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n")
+                .run(MakePackageProtected.class)
+                .findWarning("2:24-2:28:hint:" + Bundle.ERR_MakePackageProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Protected_Method() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n")
+                .run(MakePackageProtected.class)
+                .findWarning("2:26-2:30:hint:" + Bundle.ERR_MakePackageProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Protected_Field() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected String s = null;\n"
+                        + "}\n")
+                .run(MakePackageProtected.class)
+                .findWarning("2:21-2:22:hint:" + Bundle.ERR_MakePackageProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    String s = null;\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Private_Field() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    private String s = null;\n"
+                        + "}\n")
+                .run(MakePackageProtected.class)
+                .findWarning("2:19-2:20:hint:" + Bundle.ERR_MakePackageProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    String s = null;\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Public_Field() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    public String s = null;\n"
+                        + "}\n")
+                .run(MakePackageProtected.class)
+                .findWarning("2:18-2:19:hint:" + Bundle.ERR_MakePackageProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    String s = null;\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Public_InnerClass() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    public class Inner {}\n"
+                        + "}\n")
+                .run(MakePackageProtected.class)
+                .findWarning("2:17-2:22:hint:" + Bundle.ERR_MakePackageProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    class Inner {}\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Private_InnerClass() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    private class Inner {}\n"
+                        + "}\n")
+                .run(MakePackageProtected.class)
+                .findWarning("2:18-2:23:hint:" + Bundle.ERR_MakePackageProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    class Inner {}\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Protected_InnerClass() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected class Inner {}\n"
+                        + "}\n")
+                .run(MakePackageProtected.class)
+                .findWarning("2:20-2:25:hint:" + Bundle.ERR_MakePackageProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    class Inner {}\n"
+                        + "}\n");
+    }
+}
diff --git a/src/test/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePrivateTest.java b/src/test/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePrivateTest.java
new file mode 100644
index 0000000..4b6ad2c
--- /dev/null
+++ b/src/test/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePrivateTest.java
@@ -0,0 +1,96 @@
+package de.markiewb.netbeans.plugins.hints.modifiers;
+
+import org.junit.Test;
+import org.netbeans.modules.java.hints.test.api.HintTest;
+
+public class MakePrivateTest {
+
+    @Test
+    public void testFixWorking_Protected_Method() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n")
+                .run(MakePrivate.class)
+                .findWarning("2:26-2:30:hint:" + Bundle.ERR_MakePrivate())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    private static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Public_Method() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    public static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n")
+                .run(MakePrivate.class)
+                .findWarning("2:23-2:27:hint:" + Bundle.ERR_MakePrivate())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    private static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Protected_Field() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected String s = null;\n"
+                        + "}\n")
+                .run(MakePrivate.class)
+                .findWarning("2:21-2:22:hint:" + Bundle.ERR_MakePrivate())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    private String s = null;\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Public_Field() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    public String s = null;\n"
+                        + "}\n")
+                .run(MakePrivate.class)
+                .findWarning("2:18-2:19:hint:" + Bundle.ERR_MakePrivate())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    private String s = null;\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Public_InnerClass() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    public class Inner {}\n"
+                        + "}\n")
+                .run(MakePrivate.class)
+                .findWarning("2:17-2:22:hint:" + Bundle.ERR_MakePrivate())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    private class Inner {}\n"
+                        + "}\n");
+    }
+}
diff --git a/src/test/java/de/markiewb/netbeans/plugins/hints/modifiers/MakeProtectedTest.java b/src/test/java/de/markiewb/netbeans/plugins/hints/modifiers/MakeProtectedTest.java
new file mode 100644
index 0000000..8b9a682
--- /dev/null
+++ b/src/test/java/de/markiewb/netbeans/plugins/hints/modifiers/MakeProtectedTest.java
@@ -0,0 +1,166 @@
+package de.markiewb.netbeans.plugins.hints.modifiers;
+
+import org.junit.Test;
+import org.netbeans.modules.java.hints.test.api.HintTest;
+
+public class MakeProtectedTest {
+
+    @Test
+    public void testFixWorking_Public_Method() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    public static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n")
+                .run(MakeProtected.class)
+                .findWarning("2:23-2:27:hint:" + Bundle.ERR_MakeProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Private_Method() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    private static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n")
+                .run(MakeProtected.class)
+                .findWarning("2:24-2:28:hint:" + Bundle.ERR_MakeProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_PackageProtected_Method() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n")
+                .run(MakeProtected.class)
+                .findWarning("2:16-2:20:hint:" + Bundle.ERR_MakeProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_PackageProtected_Field() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    String s = null;\n"
+                        + "}\n")
+                .run(MakeProtected.class)
+                .findWarning("2:11-2:12:hint:" + Bundle.ERR_MakeProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected String s = null;\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Private_Field() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    private String s = null;\n"
+                        + "}\n")
+                .run(MakeProtected.class)
+                .findWarning("2:19-2:20:hint:" + Bundle.ERR_MakeProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected String s = null;\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Public_Field() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    public String s = null;\n"
+                        + "}\n")
+                .run(MakeProtected.class)
+                .findWarning("2:18-2:19:hint:" + Bundle.ERR_MakeProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected String s = null;\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Public_InnerClass() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    public class Inner {}\n"
+                        + "}\n")
+                .run(MakeProtected.class)
+                .findWarning("2:17-2:22:hint:" + Bundle.ERR_MakeProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected class Inner {}\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Private_InnerClass() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    private class Inner {}\n"
+                        + "}\n")
+                .run(MakeProtected.class)
+                .findWarning("2:18-2:23:hint:" + Bundle.ERR_MakeProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected class Inner {}\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_PackageProtected_InnerClass() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    class Inner {}\n"
+                        + "}\n")
+                .run(MakeProtected.class)
+                .findWarning("2:10-2:15:hint:" + Bundle.ERR_MakeProtected())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected class Inner {}\n"
+                        + "}\n");
+    }
+}
diff --git a/src/test/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePublicTest.java b/src/test/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePublicTest.java
new file mode 100644
index 0000000..8e96ee0
--- /dev/null
+++ b/src/test/java/de/markiewb/netbeans/plugins/hints/modifiers/MakePublicTest.java
@@ -0,0 +1,109 @@
+package de.markiewb.netbeans.plugins.hints.modifiers;
+
+import org.junit.Test;
+import org.netbeans.modules.java.hints.test.api.HintTest;
+
+public class MakePublicTest {
+
+    @Test
+    public void testFixWorking_PackageProtected_TopLevel_Class() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "class Test {}\n")
+                .run(MakePublic.class)
+                .findWarning("1:6-1:10:hint:" + Bundle.ERR_MakePublic())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {}\n");
+    }
+
+    @Test
+    public void testFixWorking_Protected_Method() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n")
+                .run(MakePublic.class)
+                .findWarning("2:26-2:30:hint:" + Bundle.ERR_MakePublic())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    public static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Private_Method() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    private static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n")
+                .run(MakePublic.class)
+                .findWarning("2:24-2:28:hint:" + Bundle.ERR_MakePublic())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    public static void main(String[] args) {\n"
+                        + "    }\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Protected_Field() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    protected String s = null;\n"
+                        + "}\n")
+                .run(MakePublic.class)
+                .findWarning("2:21-2:22:hint:" + Bundle.ERR_MakePublic())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    public String s = null;\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Private_Field() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    private String s = null;\n"
+                        + "}\n")
+                .run(MakePublic.class)
+                .findWarning("2:19-2:20:hint:" + Bundle.ERR_MakePublic())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    public String s = null;\n"
+                        + "}\n");
+    }
+
+    @Test
+    public void testFixWorking_Public_InnerClass() throws Exception {
+        HintTest.create()
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    private class Inner {}\n"
+                        + "}\n")
+                .run(MakePublic.class)
+                .findWarning("2:18-2:23:hint:" + Bundle.ERR_MakePublic())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    public class Inner {}\n"
+                        + "}\n");
+    }
+}