Added new rules, however some of them are failing
Added new rules, however some tests are failing