Fix for unit tests compile after last commit