Added acceptance tests for Comyar Zaheri and Shan Gupta