FLUID-5087: Tweaked unit tests to add extra theme