- make make test working again - some factoring for easier experimentation
- make make test working again
- some factoring for easier experimentation

R=rsc
http://codereview.appspot.com/174048

firebitsbr/golang-old,wesolows/golang-old,wesolows/golang,wesolows/golang-old,wesolows/golang,firebitsbr/golang-old,wesolows/golang,wesolows/golang-old,wesolows/golang,wesolows/golang-old,wesolows/golang-old,firebitsbr/golang-old,firebitsbr/golang-old,wesolows/golang,firebitsbr/golang-old,firebitsbr/golang-old,wesolows/golang-old,firebitsbr/golang-old,wesolows/golang-old,wesolows/golang,firebitsbr/golang-old,wesolows/golang