Unit Tests Added (Incomplete)