gocn/*: continued migration, still some test errors