Add a couple more unit tests