Added has_location fields
Remove blank assertions
Make broken test pending