All this is mostly just moving the existing tests there around. A cleanup would be nice, but maybe out of scope for this PR.