@dmitchell There are a few places in this test file that create Location objects directly.  Is this acceptable?  Or should I change them to call make_usage_key instead?