Adding some more unit tests