Improved test class organization