Improve coverage script a bit