Fixes for test integration.