Unit Tests Added