Fixing migration to include location_id.
Tweaks to comment model and associated tests.