Coverted to check against selectors instead of rules
Coverted to check against selectors instead of rules
Tests are passing, but only after removing one and fine tuning other