Make coverage test more robust