EX-84 (jebene/kmeng/cgates) - made all tests pass