Add range and classify test scripts, improve testing