Update dev dependencies
Improve rule and test suite