Added Tests for Comyar Zaheri and Shan Gupta