Adds support for polygons and contours, with tests for both

Suggested changes made. Note: i didn't want to add the `TestPoint{}` and `TestPoints` structs in there, but couldn't think of any quick way of getting around the issue when loading in the JSON files...