Modify location to locationId in fixtures
Merge pull request #32 from xamroc/location-to-locationId

Modify location to locationId in fixtures