Added more rules with tests