Too much copy and paste from Jeremy's tests in #645 (I think that's his PR)