WIP on multipoint tests