Added test and removed old test script