Better api/extracts test coverage