Comyar Zaheri added acceptance tests