More progress, fix some tests