Added a couple more unit tests