Unit Tests Added

TODO: test two new functions