made tests working [by alnaav]