Modified test to limit range to 17