Merge branch '684-fix-phpcs-errors-on-tests' into 'develop'

Resolve "Fix PHPCS errors on tests/"

Closes #684

See merge request !257
2 jobs for develop in 16 minutes and 3 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #16590
phpcs

00:00:26

passed #16591
phpunit

00:16:02