Rewrite locator tests in a more unit-like fashion.

Now we are just testing the locator, not the whole
pinto application.  So the test is quite a bit faster
and it is easier to diagnose.  In fact, this exposed
a couple bugs in the locators.