Updated a couple of the tests to use nested require-paths, plus fixed a bug which this revealed.