Comyar Zaheri added unit tests
Comyar Zaheri added unit tests