2df07ddc25
Also touch up use of 'pub' and move some tests around so the tested functions don't have to be 'pub'
Also touch up use of 'pub' and move some tests around so the tested functions don't have to be 'pub'