Adding more Unit Tests