Use correct class
Decided to keep make_loc in two places

Making test suites depend on each other to avoid duplicating 4 lines
seemed silly. Plus they need different default values anyway.