Improve test / rename script