Add a couple test rule aliases
A few rounds of mass refactoring