Fixes for component tests