Add tests for cinghiale fixes