FLUID-5469: Removed FSS related items from tests