Refactoring rules methods + tests
Refactoring, cleaning up and adding tests