some fixes for test suite