Adding more unitTests