test fixes discovered in go 1.4 upgrade