removed matching_optimization.yml (test are in matching.yml)
added FIXME
fixed EntityContext.__contains__ when in the past (ie not in array/extra)