tests seem to work on goto, some progress very marginal with common.hs