Updated with usage of the `jolly/testing` branch (following on-list discussion).