Fix for metadata test breakage