add test for multipoint & some misc cleanup