Added unit tests + Numeric Range functionality