The v2 api has tests for location controller
Add tests around organization controller for similar purposes.

Looks like there could be a little cleanup work on locations controller in the process.