Added tests for Comyar Zaheri and Daniel Monroy