Rewrite a couple test classes to use PHPUnit's tag checker