Add location to stories, add specs to ensure that state change is checked and
returned correctly