Range modularized and with one test