Fix for component enabled testing