Fixed tests for Go tip (v1.4)