Fix test with latest hvad
Merge pull request #3697 from yakky/feature/fix_hvad

Fix test with latest hvad