Improve coverage test