Added new Unit Tests