Fix tests for go1.3