Test scripts adjusted