[IMPROVEMENT] Pass Quality Control

**What could be improved?**
Code Coverage & Open Code Quality Issues on Codacy should be handled.

**What is currently wrong with that which should be improved?**
Code Coverage is currently at 58% which should be at a minimum of 60%, and preferably over 80-90%.

**How could we achieve this?**
- Look at the Codacy issues and Coverage Report
- Analyse the given issues
- Handle the issues appropriately (fix, neglect, won't fix)

Start with the Codacy open code-quality issues and Coverage Report mentioned in the issue, then inspect the affected PHP code and existing tests. Review each finding and decide whether to fix, neglect, or mark it won't fix. Done means the selected issues are handled and coverage reaches at least 60%, preferably 80–90%.

Written by the indexing model from the issue text.