Merge "Move scripts to test directory"