Fix EPP tests