Rename location var  add more 'testing'