Merge "Add replace location test"