Tests and fixes for Point and Force