Tweaked test-common to expect its location to be passed in as well as the base location