Added a few more unit tests