Fixing compilation and tests after removing FreeformFileStore plugin.