[Unit Tests] Add more Unit Tests

* Nice