Fixes for test suites