Simplified the test scripts