Improved test structure a bit.