Updated Andre Arcilla affiliation. Also commit test