Add more overlay tests