HG-195 fix test includes and more reference paths