A couple more unit tests