Improved test class.