Fixed scripted tests