more vigorous test suite