Add more checks for coverage