Fix test and publish procedure, and some rewords