Rejigged test structure again. Still not sure it's right.