Some changes and new test script!