python: move code around
go: fix test