make PHPCS test ruleset name more explicit
move errant test to the right place