update type and tests for locations in model and tests
Merge pull request #165 from Kae7in/modelUpdates

update type and tests for locations in model and tests