fix a few test suite issues