BS-9367, fix scripts for tests