I've changed "test" to range in the most obvious places, I'll do the other things later on tonight hopefully.