FLUID-5217: Removing wayward test files still in old location