add greater and less then tests, improve between tests