Added FileItemNormalizer, extended tests