diff --git a/Config/phpcs.xml b/Config/phpcs.xml
index 11b2189..8910468 100644
--- a/Config/phpcs.xml
+++ b/Config/phpcs.xml
@@ -61,12 +61,18 @@
 </rule>
 <rule ref="Generic.PHP.LowerCaseConstant"/>
 <rule ref="Generic.PHP.NoSilencedErrors"/>
-<!--<rule ref="Generic.Strings.UnnecessaryStringConcat"/> Bugged for single quotes where $ cannot be put inside -->
+<rule ref="Generic.Strings.UnnecessaryStringConcat">
+    <properties>
+        <property name="allowMultiline" value="true" />
+    </properties>
+</rule>
 <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
 <rule ref="MySource.PHP.EvalObjectFactory"/>
 <rule ref="MySource.PHP.GetRequestData"/>
 <rule ref="PEAR.Classes.ClassDeclaration"/>
-<!--<rule ref="PEAR.Commenting.FunctionComment"/> problem with inheritdocblock-->
+<rule ref="PEAR.Commenting.FunctionComment">
+    <exclude-pattern>*/tests/*</exclude-pattern><!-- Tests don't need comments -->
+</rule>
 <rule ref="PEAR.Commenting.InlineComment"/>
 <rule ref="PEAR.ControlStructures.ControlSignature"/>
 <rule ref="PEAR.ControlStructures.MultiLineCondition"/>
@@ -91,8 +97,15 @@
 <rule ref="Squiz.Scope.StaticThisUsage"/>
 <rule ref="Squiz.WhiteSpace.CastSpacing"/>
 <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
-<!--<rule ref="Squiz.WhiteSpace.ObjectOperatorSpacing"/> multiline object operator should be valid e.g. -> -->
+<rule ref="Squiz.WhiteSpace.ObjectOperatorSpacing">
+    <properties>
+        <property name="ignoreNewlines" value="true"/>
+    </properties>
+</rule>
 <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+    <properties>
+        <property name="ignoreNewlines" value="true"/>
+    </properties>
     <exclude-pattern>*Http.js</exclude-pattern><!-- Regex false positive -->
 </rule>
 <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>