Reviewed-by: bchristi, dcherepanov
Fix compilation of tests. Reviewed-by: anthony, son
Reviewed-by: bchristi