Added additional Unit Tests