Add more variables to get closer to full coverage