Improved test suite