Simplified test script some more