Fixes in test suite