Added tests for Freebase location.  Reworked.