Attempt to improve coverage tests