Test scripts modified