FIX sample data
ADD more sample data to test type and location detection.