Improved test projects