Add between support. Add tests.