Change locations list to list of endpoint descriptors
Fix unit tests
Fix moar tests and sprinkle print statements everywhere