improved test suite