port: the most simple tests now pass