Created by: bjoto
This PR contains some some changes to fix broken tests, so that
go test ./...
passes/works.