[ticket/249] Fix codesniffer issues

For this we also need to fix the testing suite itself.

Fixes #249