Fix map response and add speed test
Add map test