Improved test structure...