Small modifications in testing scripts