FLUID-5542: Update all tests, renamed files