Added a few unit tests