Completed unit tests
Completed unit tests