Refined the test scripts a bit.