Minor improvement of theme switching test performance.