A few more unit tests