merge and add test script