Added unit tests for Comyar Zaheri and Brandon Lee