Improved test models