Added Out of Range test + functionality