+ @mnandri - adding test for locations