Improved test layout