XD-1864 Code Review

* Fix test compilation issue