add: range rule
Unit Tests Refactoring