Merging local changes to test scripts