Improved test suite #27