add multiple consumer tests, some cleanup and phpcs fixes