Multiple points working, apart from triggers. Added some tests