#Fix the issues reported by phpcs

Thanks @benstallings.

I tried to fix the phpunit errors, but with no success.

I will investigate this further and try again later.

Still getting phpunit errors, but we're a lot closer!

Showing a merge error