Modified tests so they are based on range instead on points now.