Improved test class