Make #58 actually work and fix tests

I had a copypaste error on the previous PR - this makes it actually load that data, and required fixing two tests.