update type and tests for locations in model and tests