diff --git a/src/phpcs.xml b/src/phpcs.xml
index a014c6a..c15717f 100644
--- a/src/phpcs.xml
+++ b/src/phpcs.xml
@@ -16,8 +16,12 @@
     </rule>
     <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
     <rule ref="Generic.Commenting.DocComment">
-        <exclude name="Generic.Commenting.DocComment.TagValueIndent"/>
+        <exclude name="Generic.Commenting.DocComment.ContentAfterOpen"/>
+        <exclude name="Generic.Commenting.DocComment.ContentBeforeClose"/>
+        <exclude name="Generic.Commenting.DocComment.MissingShort"/>
         <exclude name="Generic.Commenting.DocComment.NonParamGroup"/>
+        <exclude name="Generic.Commenting.DocComment.ParamNotFirst"/>
+        <exclude name="Generic.Commenting.DocComment.TagValueIndent"/>
     </rule>
     <rule ref="Generic.ControlStructures.InlineControlStructure"/>
     <rule ref="Generic.Files.ByteOrderMark"/>
@@ -44,7 +48,8 @@
     </rule>
     <rule ref="Generic.NamingConventions.ConstructorName"/>
     <rule ref="Generic.NamingConventions.CamelCapsFunctionName">
-        <exclude-pattern>*/tests</exclude-pattern>
+        <exclude-pattern>/helpers/global_functions\.php</exclude-pattern>
+        <exclude-pattern>/tests/*</exclude-pattern>
     </rule>
     <rule ref="Generic.PHP.LowerCaseConstant"/>
     <rule ref="Generic.PHP.DeprecatedFunctions"/>
@@ -74,7 +79,7 @@
     <rule ref="PSR2.Namespaces.NamespaceDeclaration"/>
     <rule ref="PSR2.Namespaces.UseDeclaration"/>
     <rule ref="PSR1">
-        <exclude-pattern>*.php</exclude-pattern>
+        <exclude-pattern>*\.php</exclude-pattern>
         <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
 
         <exclude-pattern>database/*</exclude-pattern>
@@ -208,6 +213,6 @@
 
     <arg name="basepath" value="."/>
     <arg name="colors"/>
-    <arg value="spv"/>
+    <arg value="nspv"/>
     <ini name="memory_limit" value="128M"/>
 </ruleset>