Added more rules.  Reworked Test Classes