angshu, mario | #1119 | Updated comparison of Encounter modifications. Fixing tests