Write limit-with-location tests
Add limit parameter when using lat and long parameters
Rebase limit&lat&long off of develop