Fixing up tests and adding some new rules + tests