Couple more comments and a better test around the output