Add location class to group related stops, update tests