Finished the unit tests for verification