[Faris] Added more unit tests.