Improve Coverage Tests